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

Bugfixes for the soft/hard state calculation.

This commit is contained in:
Gunnar Beutner 2012-06-25 15:54:50 +02:00
parent 22f301073e
commit 0f5ea5b53b
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
icinga/service.cpp
View File

@ -102,7 +102,7 @@ void Service::SetCurrentCheckAttempt(long attempt)
long Service::GetCurrentCheckAttempt(void) const
{
long value = 0;
long value = 1;
GetConfigObject()->GetTag("check_attempt", &value);
return value;
}
@ -135,24 +135,22 @@ void Service::ApplyCheckResult(const CheckResult& cr)
{
long attempt = GetCurrentCheckAttempt();
if (GetState() == StateOK && cr.GetState() == StateOK) {
SetStateType(StateTypeHard);
SetCurrentCheckAttempt(0);
} else if (GetState() == StateOK && cr.GetState() != StateOK) {
attempt++;
if (cr.GetState() == StateOK) {
if (GetState() == StateOK)
SetStateType(StateTypeHard);
attempt = 1;
} else {
if (attempt >= GetMaxCheckAttempts()) {
SetStateType(StateTypeHard);
attempt = 0;
} else {
attempt = 1;
} else if (GetStateType() == StateTypeSoft || GetState() == StateOK) {
SetStateType(StateTypeSoft);
attempt++;
}
SetCurrentCheckAttempt(attempt);
} else if (GetState() != StateOK && cr.GetState() == StateOK) {
SetState(StateOK);
}
SetCurrentCheckAttempt(attempt);
SetState(cr.GetState());
}