Bugfixes for acknowledgements.

diff --git a/lib/icinga/externalcommand.cpp b/lib/icinga/externalcommand.cpp
index d7f7496fc0610dc77574fc9997156813de26b8bc..86e50c85f7d1237341d4acfc2d98760e9c67251b 100644 (file)
--- a/lib/icinga/externalcommand.cpp
+++ b/lib/icinga/externalcommand.cpp
@@ -271,6 +271,7 @@ void ExternalCommand::AcknowledgeSvcProblem(double time, const vector<String>& a
 
        Service::Ptr service = Service::GetByName(arguments[1]);
 
+       Logger::Write(LogInformation, "icinga", "Setting acknowledgement for service '" + service->GetName() + "'");
        service->SetAcknowledgement(sticky ? AcknowledgementSticky : AcknowledgementNormal);
        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."));
 
        int sticky = arguments[2].ToDouble();
-       double timestamp = arguments[4].ToDouble();
+       double timestamp = arguments[5].ToDouble();
 
        Service::Ptr service = Service::GetByName(arguments[1]);
 
+       Logger::Write(LogInformation, "icinga", "Setting timed acknowledgement for service '" + service->GetName() + "'");
        service->SetAcknowledgement(sticky ? AcknowledgementSticky : AcknowledgementNormal);
        service->SetAcknowledgementExpiry(timestamp);
 }
@@ -302,6 +304,7 @@ void ExternalCommand::RemoveSvcAcknowledgement(double time, const vector<String>
 
        Service::Ptr service = Service::GetByName(arguments[1]);
 
+       Logger::Write(LogInformation, "icinga", "Removing acknowledgement for service '" + service->GetName() + "'");
        service->SetAcknowledgement(AcknowledgementNone);
        service->SetAcknowledgementExpiry(0);
 }

diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
index d9d49ec5c1eb75b277ae2097eb0fab70f9baa65f..a0ba70e1b7f452f4131af2de8abc593448a8450c 100644 (file)
--- a/lib/icinga/service.cpp
+++ b/lib/icinga/service.cpp
@@ -402,7 +402,8 @@ AcknowledgementType Service::GetAcknowledgement(void)
 
                if (expiry != 0 && expiry < Utility::GetTime()) {
                        avalue = AcknowledgementNone;
-                       SetAcknowledgementExpiry(avalue);
+                       SetAcknowledgement(avalue);
+                       SetAcknowledgementExpiry(0);
                }
        }