mirror of https://github.com/Icinga/icinga2.git
Fix scriptfunc for dummychecktask, exceptionchecktask and sleepchecktask
This commit is contained in:
parent
b4d6fe2c8d
commit
96dc349240
|
@ -53,7 +53,7 @@ void DummyCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResu
|
||||||
if (Checkable::ExecuteCommandProcessFinishedHandler) {
|
if (Checkable::ExecuteCommandProcessFinishedHandler) {
|
||||||
ProcessResult pr;
|
ProcessResult pr;
|
||||||
pr.PID = -1;
|
pr.PID = -1;
|
||||||
pr.Output = co.first;
|
pr.Output = dummyText;
|
||||||
pr.ExecutionStart = now;
|
pr.ExecutionStart = now;
|
||||||
pr.ExecutionEnd = now;
|
pr.ExecutionEnd = now;
|
||||||
pr.ExitStatus = dummyState;
|
pr.ExitStatus = dummyState;
|
||||||
|
|
|
@ -32,7 +32,7 @@ void ExceptionCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const Check
|
||||||
pr.Output = scriptError.what();
|
pr.Output = scriptError.what();
|
||||||
pr.ExecutionStart = now;
|
pr.ExecutionStart = now;
|
||||||
pr.ExecutionEnd = now;
|
pr.ExecutionEnd = now;
|
||||||
pr.ExitStatus = 0;
|
pr.ExitStatus = 3;
|
||||||
|
|
||||||
Checkable::ExecuteCommandProcessFinishedHandler("", pr);
|
Checkable::ExecuteCommandProcessFinishedHandler("", pr);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -49,7 +49,7 @@ void SleepCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResu
|
||||||
ProcessResult pr;
|
ProcessResult pr;
|
||||||
pr.PID = -1;
|
pr.PID = -1;
|
||||||
pr.Output = output;
|
pr.Output = output;
|
||||||
pr.ExecutionStart = now;
|
pr.ExecutionStart = now - sleepTime;
|
||||||
pr.ExecutionEnd = now;
|
pr.ExecutionEnd = now;
|
||||||
pr.ExitStatus = 0;
|
pr.ExitStatus = 0;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue