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

Fix incorrect host state change logs. 

Fixes #6290
This commit is contained in:
Michael Friedrich 2014-05-25 12:45:29 +02:00
parent 13cd6f613a
commit 1436575095
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/icinga/checkable-check.cpp
View File

@ -19,6 +19,7 @@
#include "icinga/checkable.h" #include "icinga/checkable.h"
#include "icinga/service.h" #include "icinga/service.h"
#include "icinga/host.h"
#include "icinga/checkcommand.h" #include "icinga/checkcommand.h"
#include "icinga/icingaapplication.h" #include "icinga/icingaapplication.h"
#include "icinga/cib.h" #include "icinga/cib.h"
@ -401,12 +402,18 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
/* signal status updates to for example db_ido */ /* signal status updates to for example db_ido */
OnStateChanged(GetSelf()); OnStateChanged(GetSelf());
Host::Ptr host;
Service::Ptr service;
tie(host, service) = GetHostService(GetSelf());
String old_state_str = (service ? Service::StateToString(old_state) : Host::StateToString(Host::CalculateState(old_state)));
String new_state_str = (service ? Service::StateToString(new_state) : Host::StateToString(Host::CalculateState(new_state)));
if (hardChange) { if (hardChange) {
OnStateChange(GetSelf(), cr, StateTypeHard, origin); OnStateChange(GetSelf(), cr, StateTypeHard, origin);
Log(LogNotice, "icinga", "State Change: Checkable " + GetName() + " hard state change from " + Service::StateToString(old_state) + " to " + Service::StateToString(new_state) + " detected."); Log(LogNotice, "icinga", "State Change: Checkable " + GetName() + " hard state change from " + old_state_str + " to " + new_state_str + " detected.");
} else if (stateChange) { } else if (stateChange) {
OnStateChange(GetSelf(), cr, StateTypeSoft, origin); OnStateChange(GetSelf(), cr, StateTypeSoft, origin);
Log(LogNotice, "icinga", "State Change: Checkable " + GetName() + " soft state change from " + Service::StateToString(old_state) + " to " + Service::StateToString(new_state) + " detected."); Log(LogNotice, "icinga", "State Change: Checkable " + GetName() + " soft state change from " + old_state_str + " to " + new_state_str + " detected.");
} }
if (GetStateType() == StateTypeSoft || hardChange || recovery) if (GetStateType() == StateTypeSoft || hardChange || recovery)