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

Compat: Fix notification type string.

Browse Source 
Fixes #5420
This commit is contained in:
Michael Friedrich 2014-02-04 10:54:38 +01:00
parent 6549a6dd2e
commit 9dd904942a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/compat/compatlogger.cpp
View File

@ -243,6 +243,10 @@ void CompatLogger::NotificationSentHandler(const Notification::Ptr& notification
String notification_type_str = Notification::NotificationTypeToString(notification_type); String notification_type_str = Notification::NotificationTypeToString(notification_type);
/* override problem notifications with their current state string */
if (notification_type == NotificationProblem)
notification_type_str = Service::StateToString(service->GetState());
String author_comment = ""; String author_comment = "";
if (notification_type == NotificationCustom || notification_type == NotificationAcknowledgement) { if (notification_type == NotificationCustom || notification_type == NotificationAcknowledgement) {
author_comment = author + ";" + comment_text; author_comment = author + ";" + comment_text;
@ -260,8 +264,7 @@ void CompatLogger::NotificationSentHandler(const Notification::Ptr& notification
<< user->GetName() << ";" << user->GetName() << ";"
<< host->GetName() << ";" << host->GetName() << ";"
<< service->GetShortName() << ";" << service->GetShortName() << ";"
<< notification_type_str << " " << notification_type_str << ";"
<< "(" << Service::StateToString(service->GetState()) << ");"
<< command_name << ";" << command_name << ";"
<< output << ";" << output << ";"
<< author_comment << author_comment