tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-24 22:24:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes for acknowledgements.

Browse Source
This commit is contained in:
Gunnar Beutner 2013-01-23 13:46:35 +01:00
parent 249b19a69a
commit 1be64b9290
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/icinga/externalcommand.cpp
View File

@ -271,6 +271,7 @@ void ExternalCommand::AcknowledgeSvcProblem(double time, const vector<String>& a
Service::Ptr service = Service::GetByName(arguments[1]); Service::Ptr service = Service::GetByName(arguments[1]);
Logger::Write(LogInformation, "icinga", "Setting acknowledgement for service '" + service->GetName() + "'");
service->SetAcknowledgement(sticky ? AcknowledgementSticky : AcknowledgementNormal); service->SetAcknowledgement(sticky ? AcknowledgementSticky : AcknowledgementNormal);
service->SetAcknowledgementExpiry(0); service->SetAcknowledgementExpiry(0);
} }
@ -284,10 +285,11 @@ void ExternalCommand::AcknowledgeSvcProblemExpire(double time, const vector<Stri
throw_exception(invalid_argument("The service '" + arguments[1] + "' does not exist.")); throw_exception(invalid_argument("The service '" + arguments[1] + "' does not exist."));
int sticky = arguments[2].ToDouble(); int sticky = arguments[2].ToDouble();
double timestamp = arguments[4].ToDouble(); double timestamp = arguments[5].ToDouble();
Service::Ptr service = Service::GetByName(arguments[1]); Service::Ptr service = Service::GetByName(arguments[1]);
Logger::Write(LogInformation, "icinga", "Setting timed acknowledgement for service '" + service->GetName() + "'");
service->SetAcknowledgement(sticky ? AcknowledgementSticky : AcknowledgementNormal); service->SetAcknowledgement(sticky ? AcknowledgementSticky : AcknowledgementNormal);
service->SetAcknowledgementExpiry(timestamp); service->SetAcknowledgementExpiry(timestamp);
} }
@ -302,6 +304,7 @@ void ExternalCommand::RemoveSvcAcknowledgement(double time, const vector<String>
Service::Ptr service = Service::GetByName(arguments[1]); Service::Ptr service = Service::GetByName(arguments[1]);
Logger::Write(LogInformation, "icinga", "Removing acknowledgement for service '" + service->GetName() + "'");
service->SetAcknowledgement(AcknowledgementNone); service->SetAcknowledgement(AcknowledgementNone);
service->SetAcknowledgementExpiry(0); service->SetAcknowledgementExpiry(0);
} }

3
lib/icinga/service.cpp
View File

@ -402,7 +402,8 @@ AcknowledgementType Service::GetAcknowledgement(void)
if (expiry != 0 && expiry < Utility::GetTime()) { if (expiry != 0 && expiry < Utility::GetTime()) {
avalue = AcknowledgementNone; avalue = AcknowledgementNone;
SetAcknowledgementExpiry(avalue); SetAcknowledgement(avalue);
SetAcknowledgementExpiry(0);
} }
} }