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 #7884 from Icinga/bugfix/on-host-problem-changed 

Fix OnHostProblemChanged signal
This commit is contained in:
Noah Hilverling 2020-03-04 12:33:44 +01:00 committed by GitHub
parent e4616d9fc6 8f061ae80e
commit 27dcb8f221
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -248,20 +248,7 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
SetCheckAttempt(attempt); SetCheckAttempt(attempt);
ServiceState new_state = cr->GetState(); ServiceState new_state = cr->GetState();
SetStateRaw(new_state);
if (service) {
SetStateRaw(new_state);
} else {
bool wasProblem = GetProblem();
SetStateRaw(new_state);
if (GetProblem() != wasProblem) {
for (auto& service : host->GetServices()) {
Service::OnHostProblemChanged(service, cr, origin);
}
}
}
bool stateChange; bool stateChange;
@ -362,7 +349,20 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
cr->SetVarsAfter(vars_after); cr->SetVarsAfter(vars_after);
olock.Lock(); olock.Lock();
SetLastCheckResult(cr);
if (service) {
SetLastCheckResult(cr);
} else {
bool wasProblem = GetProblem();
SetLastCheckResult(cr);
if (GetProblem() != wasProblem) {
for (auto& service : host->GetServices()) {
Service::OnHostProblemChanged(service, cr, origin);
}
}
}
bool was_flapping = IsFlapping(); bool was_flapping = IsFlapping();