Changeset 112

Timestamp:

10/21/06 07:20:32 (7 years ago)

Author:

lincoln

Message:

more cosmetic

Files:

• shepherd (modified) (2 diffs)

shepherd

@@ -926 +926 @@
 
         if ($missing_peak+$missing_nonpeak+$missing_other) {
-            $statusstring .= sprintf ": missing %s (",
+            $statusstring .= sprintf ": missing %s total (",
               pretty_duration(($missing_peak+$missing_nonpeak+$missing_other));
 
-            $statusstring .= sprintf "peak %s",
+            $statusstring .= sprintf "%s in peak",
                 pretty_duration($missing_peak,$policy{peak_max_missing})
                 if ($missing_peak > 0);
 
-            $statusstring .= sprintf "%snon-peak %s",
+            $statusstring .= sprintf "%s%s in non-peak",
                 ($missing_peak > 0 ? ", " : ""),
                 pretty_duration($missing_nonpeak,$policy{nonpeak_max_missing})
                 if ($missing_nonpeak > 0);
 
-            $statusstring .= sprintf "%sother %s",
+            $statusstring .= sprintf "%s%s in other",
                 (($missing_peak+$missing_nonpeak) > 0 ? ", " : ""),
                 pretty_duration($missing_other,$policy{other_max_missing})
@@ -963 +963 @@
     $s .= sprintf "%dh",int(($d % (60*60*24)) / (60*60)) if (($d % (60*60*24)) > (60*60));
     $s .= sprintf "%dm",int(($d % (60*60)) / 60) if (($d % (60*60)) > 60);
+    $s .= "no data" if ($s eq "");
 
     if (defined $crit) {