tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Service::{Get,Set}ModifiedAttributes.

This commit is contained in:
Gunnar Beutner 2013-10-16 13:08:55 +02:00
parent 45eb84f730
commit 3ba0616620
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/icinga/service.cpp
View File

@ -343,7 +343,7 @@ int Service::GetModifiedAttributes(void) const
if (!m_OverrideEnablePassiveChecks.IsEmpty()) if (!m_OverrideEnablePassiveChecks.IsEmpty())
attrs |= ModAttrPassiveChecksEnabled; attrs |= ModAttrPassiveChecksEnabled;
if (!m_OverrideCheckInterval) if (!m_OverrideCheckInterval.IsEmpty())
attrs |= ModAttrNormalCheckInterval; attrs |= ModAttrNormalCheckInterval;
if (!m_OverrideRetryInterval.IsEmpty()) if (!m_OverrideRetryInterval.IsEmpty())
@ -361,6 +361,12 @@ void Service::SetModifiedAttributes(int flags)
if ((flags & ModAttrPassiveChecksEnabled) == 0) if ((flags & ModAttrPassiveChecksEnabled) == 0)
m_OverrideEnablePassiveChecks = Empty; m_OverrideEnablePassiveChecks = Empty;
if ((flags & ModAttrNormalCheckInterval) == 0)
m_OverrideCheckInterval = Empty;
if ((flags & ModAttrRetryCheckInterval) == 0)
m_OverrideRetryInterval = Empty;
} }
bool Service::ResolveMacro(const String& macro, const Dictionary::Ptr& cr, String *result) const bool Service::ResolveMacro(const String& macro, const Dictionary::Ptr& cr, String *result) const