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

More bugfixes for notifications.

Browse Source
This commit is contained in:
Gunnar Beutner 2013-03-21 11:37:34 +01:00
parent e60c04f4bd
commit db8ac1431c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/icinga/service-check.cpp
View File

@ -502,6 +502,9 @@ void Service::ProcessCheckResult(const Dictionary::Ptr& cr)
bool hardChange = (GetStateType() == StateTypeHard && old_stateType == StateTypeSoft); bool hardChange = (GetStateType() == StateTypeHard && old_stateType == StateTypeSoft);
if (old_state != GetState() && old_stateType == StateTypeHard && GetStateType() == StateTypeHard)
hardChange = true;
if (hardChange) if (hardChange)
SetLastHardStateChange(now); SetLastHardStateChange(now);
@ -516,9 +519,6 @@ void Service::ProcessCheckResult(const Dictionary::Ptr& cr)
if (old_state == StateOK && old_stateType == StateTypeSoft) if (old_state == StateOK && old_stateType == StateTypeSoft)
send_notification = false; /* Don't send notifications for SOFT-OK -> HARD-OK. */ send_notification = false; /* Don't send notifications for SOFT-OK -> HARD-OK. */
if (old_state != StateOK && GetState() == StateOK && old_stateType == StateTypeHard && GetState() == StateTypeHard)
send_notification = true; /* Send notifications for hard recoveries. (HARD-NON-OK -> HARD-OK) */
bool send_downtime_notification = m_LastInDowntime != in_downtime; bool send_downtime_notification = m_LastInDowntime != in_downtime;
m_LastInDowntime = in_downtime; m_LastInDowntime = in_downtime;
Touch("last_in_downtime"); Touch("last_in_downtime");