tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-09-23 17:57:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add try catch for ExecuteEventHandler

Browse Source
This commit is contained in:
Mattia Codato 2020-07-23 13:03:30 +02:00 committed by Noah Hilverling
parent 78743098b0
commit 3ce56ac11a
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/icinga/clusterevents-check.cpp
View File

@ -287,7 +287,18 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
Log(LogCritical, "checker", output);
}
} else if (command_type == "event_command") {
host->ExecuteEventHandler(macros, true);
try {
host->ExecuteEventHandler(macros, true);
} catch (const std::exception& ex) {
if (params->Contains("source")) {
String output = "Exception occurred while executing event command '" + command + "' for '" +
host->GetName() + "': " + DiagnosticInformation(ex);
double now = Utility::GetTime();
ServiceState state = ServiceUnknown;
SendEventExecuteCommand(params, state, output, now, now, listener, origin, sourceEndpoint);
}
}
} else if (command_type == "notification_command") {
/* Get user */
User::Ptr user = new User();