Fixed error and success codes (638656 - Paul Dlug)

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@271 f882894a-f735-0410-b71e-b25c423dba1c

diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index 05830026a760d716800505d538876b8b06b8478b..94e6e0808102906b48cbbfccb82c5dd0674c91e1 100644 (file)
--- a/plugins/check_mrtgtraf.c
+++ b/plugins/check_mrtgtraf.c
@@ -197,27 +197,26 @@ main (int argc, char **argv)
        if (incoming_rate > incoming_critical_threshold
                        || outgoing_rate > outgoing_critical_threshold) {
                result = STATE_CRITICAL;
-               asprintf (&error_message, "%s. In = %0.1f %s, %s. Out = %0.1f %s",
-                                                (use_average == TRUE) ? "Ave" : "Max", adjusted_incoming_rate,
-                                                incoming_speed_rating, (use_average == TRUE) ? "Ave" : "Max",
+               asprintf (&error_message, "Traffic CRITICAL %s. In = %0.1f %s, %s. Out = %0.1f %s",
+                                                (use_average == TRUE) ? "Avg" : "Max", adjusted_incoming_rate,
+                                                incoming_speed_rating, (use_average == TRUE) ? "Avg" : "Max",
                                                 adjusted_outgoing_rate, outgoing_speed_rating);
        }
        else if (incoming_rate > incoming_warning_threshold
                                         || outgoing_rate > outgoing_warning_threshold) {
                result = STATE_WARNING;
-               asprintf (&error_message, "%s. In = %0.1f %s, %s. Out = %0.1f %s",
-                                                (use_average == TRUE) ? "Ave" : "Max", adjusted_incoming_rate,
-                                                incoming_speed_rating, (use_average == TRUE) ? "Ave" : "Max",
+               asprintf (&error_message, "Traffic WARNING %s. In = %0.1f %s, %s. Out = %0.1f %s",
+                                                (use_average == TRUE) ? "Avg" : "Max", adjusted_incoming_rate,
+                                                incoming_speed_rating, (use_average == TRUE) ? "Avg" : "Max",
                                                 adjusted_outgoing_rate, outgoing_speed_rating);
        }
-
-       if (result == STATE_OK)
-               printf ("Traffic ok - %s. In = %0.1f %s, %s. Out = %0.1f %s\n",
-                                               (use_average == TRUE) ? "Ave" : "Max", adjusted_incoming_rate,
-                                               incoming_speed_rating, (use_average == TRUE) ? "Ave" : "Max",
+       else if (result == STATE_OK)
+               printf ("Traffic OK - %s. In = %0.1f %s, %s. Out = %0.1f %s\n",
+                                               (use_average == TRUE) ? "Avg" : "Max", adjusted_incoming_rate,
+                                               incoming_speed_rating, (use_average == TRUE) ? "Avg" : "Max",
                                                adjusted_outgoing_rate, outgoing_speed_rating);
        else
-               printf ("%s\n", error_message);
+               printf ("UNKNOWN %s\n", error_message);
 
        return result;
 }