tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-06-02 21:00:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

config: Rename Notification::groups to Notification::user_groups.

Browse Source
This commit is contained in:
Gunnar Beutner 2013-09-25 09:23:12 +02:00
parent b10db3bd7f
commit 881c47893a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/icinga/notification.cpp
View File

@ -100,11 +100,11 @@ std::set<User::Ptr> Notification::GetUsers(void) const
return result; return result;
} }
std::set<UserGroup::Ptr> Notification::GetGroups(void) const std::set<UserGroup::Ptr> Notification::GetUserGroups(void) const
{ {
std::set<UserGroup::Ptr> result; std::set<UserGroup::Ptr> result;
Array::Ptr groups = m_Groups; Array::Ptr groups = m_UserGroups;
if (groups) { if (groups) {
ObjectLock olock(groups); ObjectLock olock(groups);
@ -291,7 +291,7 @@ void Notification::BeginExecuteNotification(NotificationType type, const Diction
std::set<User::Ptr> users = GetUsers(); std::set<User::Ptr> users = GetUsers();
std::copy(users.begin(), users.end(), std::inserter(allUsers, allUsers.begin())); std::copy(users.begin(), users.end(), std::inserter(allUsers, allUsers.begin()));
BOOST_FOREACH(const UserGroup::Ptr& ug, GetGroups()) { BOOST_FOREACH(const UserGroup::Ptr& ug, GetUserGroups()) {
std::set<User::Ptr> members = ug->GetMembers(); std::set<User::Ptr> members = ug->GetMembers();
std::copy(members.begin(), members.end(), std::inserter(allUsers, allUsers.begin())); std::copy(members.begin(), members.end(), std::inserter(allUsers, allUsers.begin()));
} }
@ -385,7 +385,7 @@ void Notification::InternalSerialize(const Dictionary::Ptr& bag, int attributeTy
bag->Set("notification_period", m_NotificationPeriod); bag->Set("notification_period", m_NotificationPeriod);
bag->Set("macros", m_Macros); bag->Set("macros", m_Macros);
bag->Set("users", m_Users); bag->Set("users", m_Users);
bag->Set("groups", m_Groups); bag->Set("user_groups", m_UserGroups);
bag->Set("times", m_Times); bag->Set("times", m_Times);
bag->Set("notification_type_filter", m_NotificationTypeFilter); bag->Set("notification_type_filter", m_NotificationTypeFilter);
bag->Set("notification_state_filter", m_NotificationStateFilter); bag->Set("notification_state_filter", m_NotificationStateFilter);
@ -411,7 +411,7 @@ void Notification::InternalDeserialize(const Dictionary::Ptr& bag, int attribute
m_NotificationPeriod = bag->Get("notification_period"); m_NotificationPeriod = bag->Get("notification_period");
m_Macros = bag->Get("macros"); m_Macros = bag->Get("macros");
m_Users = bag->Get("users"); m_Users = bag->Get("users");
m_Groups = bag->Get("groups"); m_UserGroups = bag->Get("user_groups");
m_Times = bag->Get("times"); m_Times = bag->Get("times");
m_NotificationTypeFilter = bag->Get("notification_type_filter"); m_NotificationTypeFilter = bag->Get("notification_type_filter");
m_NotificationStateFilter = bag->Get("notification_state_filter"); m_NotificationStateFilter = bag->Get("notification_state_filter");

4
lib/icinga/notification.h
View File

@ -68,7 +68,7 @@ public:
Dictionary::Ptr GetMacros(void) const; Dictionary::Ptr GetMacros(void) const;
Array::Ptr GetExportMacros(void) const; Array::Ptr GetExportMacros(void) const;
std::set<User::Ptr> GetUsers(void) const; std::set<User::Ptr> GetUsers(void) const;
std::set<UserGroup::Ptr> GetGroups(void) const; std::set<UserGroup::Ptr> GetUserGroups(void) const;
Dictionary::Ptr GetTimes(void) const; Dictionary::Ptr GetTimes(void) const;
unsigned long GetNotificationTypeFilter(void) const; unsigned long GetNotificationTypeFilter(void) const;
unsigned long GetNotificationStateFilter(void) const; unsigned long GetNotificationStateFilter(void) const;
@ -108,7 +108,7 @@ private:
Dictionary::Ptr m_Macros; Dictionary::Ptr m_Macros;
Array::Ptr m_ExportMacros; Array::Ptr m_ExportMacros;
Array::Ptr m_Users; Array::Ptr m_Users;
Array::Ptr m_Groups; Array::Ptr m_UserGroups;
Dictionary::Ptr m_Times; Dictionary::Ptr m_Times;
Value m_NotificationTypeFilter; Value m_NotificationTypeFilter;
Value m_NotificationStateFilter; Value m_NotificationStateFilter;