tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-28 08:04:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make "enable_notifications" a config attribute

Browse Source 
fixes #6671
This commit is contained in:
Gunnar Beutner 2014-07-10 10:57:44 +02:00
parent d56da32a16
commit 7e83247508
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/icinga/user.cpp
View File

@ -30,6 +30,8 @@ using namespace icinga;
REGISTER_TYPE(User); REGISTER_TYPE(User);
REGISTER_SCRIPTFUNCTION(ValidateUserFilters, &User::ValidateFilters); REGISTER_SCRIPTFUNCTION(ValidateUserFilters, &User::ValidateFilters);
boost::signals2::signal<void (const User::Ptr&, bool, const MessageOrigin&)> User::OnEnableNotificationsChanged;
void User::OnConfigLoaded(void) void User::OnConfigLoaded(void)
{ {
SetTypeFilter(FilterArrayToInt(GetTypes(), ~0)); SetTypeFilter(FilterArrayToInt(GetTypes(), ~0));
@ -49,7 +51,6 @@ void User::OnConfigLoaded(void)
} }
} }
void User::Stop(void) void User::Stop(void)
{ {
DynamicObject::Stop(); DynamicObject::Stop();
@ -124,3 +125,19 @@ void User::SetModifiedAttributes(int flags, const MessageOrigin& origin)
OnVarsChanged(GetSelf(), origin); OnVarsChanged(GetSelf(), origin);
} }
} }
bool User::GetEnableNotifications(void) const
{
if (!GetOverrideEnableNotifications().IsEmpty())
return GetOverrideEnableNotifications();
else
return GetEnableNotificationsRaw();
}
void User::SetEnableNotifications(bool enabled, const MessageOrigin& origin)
{
SetOverrideEnableNotifications(enabled);
OnEnableNotificationsChanged(GetSelf(), enabled, origin);
}

5
lib/icinga/user.hpp
View File

@ -46,9 +46,14 @@ public:
static void ValidateFilters(const String& location, const Dictionary::Ptr& attrs); static void ValidateFilters(const String& location, const Dictionary::Ptr& attrs);
bool GetEnableNotifications(void) const;
void SetEnableNotifications(bool enabled, const MessageOrigin& origin = MessageOrigin());
int GetModifiedAttributes(void) const; int GetModifiedAttributes(void) const;
void SetModifiedAttributes(int flags, const MessageOrigin& origin = MessageOrigin()); void SetModifiedAttributes(int flags, const MessageOrigin& origin = MessageOrigin());
static boost::signals2::signal<void (const User::Ptr&, bool, const MessageOrigin&)> OnEnableNotificationsChanged;
protected: protected:
virtual void Stop(void); virtual void Stop(void);

4
lib/icinga/user.ti
View File

@ -26,9 +26,11 @@ class User : CustomVarObject
[config] String email; [config] String email;
[config] String pager; [config] String pager;
[state] bool enable_notifications { [config] bool enable_notifications (EnableNotificationsRaw) {
default {{{ return true; }}} default {{{ return true; }}}
}; };
[state] Value override_enable_notifications;
[state] double last_notification; [state] double last_notification;
}; };