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 #6343 from Icinga/fix/checks-via-command_endpoint-are-not-executed-6337 

Fix that checks with command_endpoint don't return any check results
This commit is contained in:
Jean Flach 2018-06-07 11:42:40 +02:00 committed by GitHub
parent 197477b6d6 d8b400dc17
commit ee37c8c68e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,7 +107,7 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
m_CheckRunning = false; m_CheckRunning = false;
} }
if (!cr || !IsActive()) if (!cr)
return; return;
double now = Utility::GetTime(); double now = Utility::GetTime();
@ -147,6 +147,9 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
} }
if (!IsActive())
return;
bool reachable = IsReachable(); bool reachable = IsReachable();
bool notification_reachable = IsReachable(DependencyNotification); bool notification_reachable = IsReachable(DependencyNotification);