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

ModifiedAttributes for Enable* must call signals. 

Refs #6151
Refs #5219
This commit is contained in:
Michael Friedrich 2014-05-10 17:24:39 +02:00
parent 76658e7ddd
commit 7730cc9b52
6 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/icinga/checkable.cpp
View File

@ -215,25 +215,35 @@ int Checkable::GetModifiedAttributes(void) const
return attrs; return attrs;
} }
void Checkable::SetModifiedAttributes(int flags) void Checkable::SetModifiedAttributes(int flags, const MessageOrigin& origin)
{ {
if ((flags & ModAttrNotificationsEnabled) == 0) if ((flags & ModAttrNotificationsEnabled) == 0) {
SetOverrideEnableNotifications(Empty); SetOverrideEnableNotifications(Empty);
OnEnableNotificationsChanged(GetSelf(), GetEnableNotifications(), origin);
}
if ((flags & ModAttrActiveChecksEnabled) == 0) if ((flags & ModAttrActiveChecksEnabled) == 0) {
SetOverrideEnableActiveChecks(Empty); SetOverrideEnableActiveChecks(Empty);
OnEnableActiveChecksChanged(GetSelf(), GetEnableActiveChecks(), origin);
}
if ((flags & ModAttrPassiveChecksEnabled) == 0) if ((flags & ModAttrPassiveChecksEnabled) == 0) {
SetOverrideEnablePassiveChecks(Empty); SetOverrideEnablePassiveChecks(Empty);
OnEnablePassiveChecksChanged(GetSelf(), GetEnablePassiveChecks(), origin);
}
if ((flags & ModAttrFlapDetectionEnabled) == 0) if ((flags & ModAttrFlapDetectionEnabled) == 0) {
SetOverrideEnableFlapping(Empty); SetOverrideEnableFlapping(Empty);
OnEnableFlappingChanged(GetSelf(), GetEnableFlapping(), origin);
}
if ((flags & ModAttrEventHandlerEnabled) == 0) if ((flags & ModAttrEventHandlerEnabled) == 0)
SetOverrideEnableEventHandler(Empty); SetOverrideEnableEventHandler(Empty);
if ((flags & ModAttrPerformanceDataEnabled) == 0) if ((flags & ModAttrPerformanceDataEnabled) == 0) {
SetOverrideEnablePerfdata(Empty); SetOverrideEnablePerfdata(Empty);
OnEnablePerfdataChanged(GetSelf(), GetEnablePerfdata(), origin);
}
if ((flags & ModAttrNormalCheckInterval) == 0) if ((flags & ModAttrNormalCheckInterval) == 0)
SetOverrideCheckInterval(Empty); SetOverrideCheckInterval(Empty);

2
lib/icinga/checkable.h
View File

@ -143,7 +143,7 @@ public:
void ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrigin& origin = MessageOrigin()); void ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrigin& origin = MessageOrigin());
int GetModifiedAttributes(void) const; int GetModifiedAttributes(void) const;
void SetModifiedAttributes(int flags); void SetModifiedAttributes(int flags, const MessageOrigin& origin = MessageOrigin());
bool IsCheckPending(void) const; bool IsCheckPending(void) const;

2
lib/icinga/command.cpp
View File

@ -45,7 +45,7 @@ int Command::GetModifiedAttributes(void) const
return attrs; return attrs;
} }
void Command::SetModifiedAttributes(int flags) void Command::SetModifiedAttributes(int flags, const MessageOrigin& origin)
{ {
if ((flags & ModAttrCustomVariable) == 0) { if ((flags & ModAttrCustomVariable) == 0) {
SetOverrideVars(Empty); SetOverrideVars(Empty);

3
lib/icinga/command.h
View File

@ -25,6 +25,7 @@
#include "base/i2-base.h" #include "base/i2-base.h"
#include "base/array.h" #include "base/array.h"
#include "base/logger_fwd.h" #include "base/logger_fwd.h"
#include "remote/messageorigin.h"
#include <set> #include <set>
namespace icinga namespace icinga
@ -45,7 +46,7 @@ public:
virtual bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, String *result) const; virtual bool ResolveMacro(const String& macro, const CheckResult::Ptr& cr, String *result) const;
int GetModifiedAttributes(void) const; int GetModifiedAttributes(void) const;
void SetModifiedAttributes(int flags); void SetModifiedAttributes(int flags, const MessageOrigin& origin = MessageOrigin());
}; };
} }

2
lib/icinga/user.cpp
View File

@ -118,7 +118,7 @@ int User::GetModifiedAttributes(void) const
return attrs; return attrs;
} }
void User::SetModifiedAttributes(int flags) void User::SetModifiedAttributes(int flags, const MessageOrigin& origin)
{ {
if ((flags & ModAttrCustomVariable) == 0) { if ((flags & ModAttrCustomVariable) == 0) {
SetOverrideVars(Empty); SetOverrideVars(Empty);

3
lib/icinga/user.h
View File

@ -25,6 +25,7 @@
#include "icinga/macroresolver.h" #include "icinga/macroresolver.h"
#include "icinga/timeperiod.h" #include "icinga/timeperiod.h"
#include "base/array.h" #include "base/array.h"
#include "remote/messageorigin.h"
namespace icinga namespace icinga
{ {
@ -48,7 +49,7 @@ public:
static void ValidateFilters(const String& location, const Dictionary::Ptr& attrs); static void ValidateFilters(const String& location, const Dictionary::Ptr& attrs);
int GetModifiedAttributes(void) const; int GetModifiedAttributes(void) const;
void SetModifiedAttributes(int flags); void SetModifiedAttributes(int flags, const MessageOrigin& origin = MessageOrigin());
protected: protected:
virtual void Stop(void); virtual void Stop(void);