[Pkg-nagios-changes] [SCM] Debian packaging for mod gearman. branch, master, updated. f5edd3e88aa2138dcf6d044c835fbd0ada944168

Sven Nierlein sven at nierlein.de
Fri Feb 11 11:18:04 UTC 2011


The following commit has been merged in the master branch:
commit 4d3a424f1b62b2af911ef1d02e28577488fc6b49
Author: Sven Nierlein <sven at nierlein.de>
Date:   Mon Jan 24 11:05:17 2011 +0100

    send_multi does not set <performance> unless there are performance data

diff --git a/tools/send_multi.c b/tools/send_multi.c
index ad9c562..156816d 100644
--- a/tools/send_multi.c
+++ b/tools/send_multi.c
@@ -397,9 +397,11 @@ int read_child_check(char *bufstart, char *bufend) {
     if ((attribute=read_multi_attribute(bufstart,bufend,"output")) == NULL)
         return 0;
     /* performance data */
-    if ((attribute2=read_multi_attribute(bufstart,bufend,"performance")) == NULL)
-        return 0;
-    snprintf( temp_buffer, sizeof( temp_buffer )-1, "%s|%s", decode_xml(attribute), decode_xml(attribute2));
+    if ((attribute2=read_multi_attribute(bufstart,bufend,"performance")) == NULL) {
+        snprintf( temp_buffer, sizeof( temp_buffer )-1, "%s", decode_xml(attribute));
+    } else {
+        snprintf( temp_buffer, sizeof( temp_buffer )-1, "%s|%s", decode_xml(attribute), decode_xml(attribute2));
+    }
     mod_gm_opt->message=strdup(temp_buffer);
     gm_log( GM_LOG_TRACE, "mod_gm_opt->message: %s\n", mod_gm_opt->message);
 

-- 
Debian packaging for mod gearman.



More information about the Pkg-nagios-changes mailing list