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

Remove unuseful check result for notification command

This commit is contained in:
Mattia Codato 2020-07-23 12:58:50 +02:00
parent 9940aaf90c
commit 14c02ec654
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -322,29 +322,15 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
notificationCommand->Execute(notification, user, cr, NotificationType::NotificationCustom, notificationCommand->Execute(notification, user, cr, NotificationType::NotificationCustom,
author, ""); author, "");
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
String output = "Exception occurred during notification '" + notification->GetName()
+ "' for checkable '" + notification->GetCheckable()->GetName()
+ "' and user '" + user->GetName() + "' using command '" + command + "': "
+ DiagnosticInformation(ex, false);
double now = Utility::GetTime();
ServiceState state = ServiceUnknown;
if (params->Contains("source")) { if (params->Contains("source")) {
String output = "Exception occurred during notification '" + notification->GetName()
+ "' for checkable '" + notification->GetCheckable()->GetName()
+ "' and user '" + user->GetName() + "' using command '" + command + "': "
+ DiagnosticInformation(ex, false);
double now = Utility::GetTime();
ServiceState state = ServiceUnknown;
SendEventExecuteCommand(params, state, output, now, now, listener, origin, sourceEndpoint); SendEventExecuteCommand(params, state, output, now, now, listener, origin, sourceEndpoint);
} else {
CheckResult::Ptr cr = new CheckResult();
cr->SetState(state);
cr->SetOutput(output);
cr->SetScheduleStart(now);
cr->SetScheduleEnd(now);
cr->SetExecutionStart(now);
cr->SetExecutionEnd(now);
Dictionary::Ptr message = MakeCheckResultMessage(host, cr);
listener->SyncSendMessage(sourceEndpoint, message);
} }
Log(LogCritical, "checker", output);
} }
} }
} }