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

Fix default values for notification filters. 

Refs #5979
This commit is contained in:
Gunnar Beutner 2014-04-08 23:33:25 +02:00
parent ba2309338e
commit dcf7d07c7a
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/icinga/notification.cpp
View File

@ -78,8 +78,8 @@ void Notification::StaticInitialize(void)
void Notification::OnConfigLoaded(void)
{
SetNotificationTypeFilter(FilterArrayToInt(GetNotificationTypeFilterRaw(), 0));
SetNotificationStateFilter(FilterArrayToInt(GetNotificationStateFilterRaw(), 0));
SetNotificationTypeFilter(FilterArrayToInt(GetNotificationTypeFilterRaw(), ~0));
SetNotificationStateFilter(FilterArrayToInt(GetNotificationStateFilterRaw(), ~0));
GetCheckable()->AddNotification(GetSelf());
}
@ -252,13 +252,9 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
return;
}
Service::Ptr service = dynamic_pointer_cast<Service>(checkable);
Host::Ptr host;
if (service)
host = service->GetHost();
else
host = static_pointer_cast<Host>(checkable);
Service::Ptr service;
tie(host, service) = GetHostService(checkable);
unsigned long fstate;
@ -333,13 +329,9 @@ bool Notification::CheckNotificationUserFilters(NotificationType type, const Use
}
Checkable::Ptr checkable = GetCheckable();
Service::Ptr service = dynamic_pointer_cast<Service>(checkable);
Host::Ptr host;
if (service)
host = service->GetHost();
else
host = static_pointer_cast<Host>(checkable);
Service::Ptr service;
tie(host, service) = GetHostService(checkable);
unsigned long fstate;
@ -422,7 +414,7 @@ int icinga::FilterArrayToInt(const Array::Ptr& typeFilters, int defaultValue)
{
Value resultTypeFilter;
if (!typeFilters || typeFilters->GetLength() == 0)
if (!typeFilters)
return defaultValue;
resultTypeFilter = 0;

4
lib/icinga/user.cpp
View File

@ -33,8 +33,8 @@ REGISTER_SCRIPTFUNCTION(ValidateUserFilters, &User::ValidateFilters);
void User::OnConfigLoaded(void)
{
SetNotificationTypeFilter(FilterArrayToInt(GetNotificationTypeFilterRaw(), 0));
SetNotificationStateFilter(FilterArrayToInt(GetNotificationStateFilterRaw(), 0));
SetNotificationTypeFilter(FilterArrayToInt(GetNotificationTypeFilterRaw(), ~0));
SetNotificationStateFilter(FilterArrayToInt(GetNotificationStateFilterRaw(), ~0));
Array::Ptr groups = GetGroups();