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

Merge pull request #5528 from widhalmt/fix/checkable-log 

Change loglines for checkables so checkable is quoted
This commit is contained in:
Michael Friedrich 2017-08-23 19:49:02 +02:00 committed by GitHub
parent dfcd3ef115 de9a097a97
commit 65116ea06f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -354,13 +354,13 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
if (hardChange || (is_volatile && !(IsStateOK(old_state) && IsStateOK(new_state)))) { if (hardChange || (is_volatile && !(IsStateOK(old_state) && IsStateOK(new_state)))) {
OnStateChange(this, cr, StateTypeHard, origin); OnStateChange(this, cr, StateTypeHard, origin);
Log(LogNotice, "Checkable") Log(LogNotice, "Checkable")
<< "State Change: Checkable " << GetName() << " hard state change from " << old_state_str << " to " << new_state_str << " detected." << (is_volatile ? " Checkable is volatile." : ""); << "State Change: Checkable '" << GetName() << "' hard state change from " << old_state_str << " to " << new_state_str << " detected." << (is_volatile ? " Checkable is volatile." : "");
} }
/* Whether a state change happened or the state type is SOFT (must be logged too). */ /* Whether a state change happened or the state type is SOFT (must be logged too). */
else if (stateChange || GetStateType() == StateTypeSoft) { else if (stateChange || GetStateType() == StateTypeSoft) {
OnStateChange(this, cr, StateTypeSoft, origin); OnStateChange(this, cr, StateTypeSoft, origin);
Log(LogNotice, "Checkable") Log(LogNotice, "Checkable")
<< "State Change: Checkable " << GetName() << " soft state change from " << old_state_str << " to " << new_state_str << " detected."; << "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 ||