Changeset 347

Timestamp:

12/10/06 12:57:35 (6 years ago)

Author:

max

Message:

Tidy output, to make it a little clearer when output comes from a component

Files:

• applications/shepherd (modified) (3 diffs)

applications/shepherd

@@ -490 +490 @@
     if ($result)
     {
-        &log("\n" . ucfirst($progtype) . " $proggy did not exit cleanly!\n" .
+        &log(ucfirst($progtype) . " $proggy did not exit cleanly!\n" .
              "It may require configuration.\n");
 
@@ -873 +873 @@
 
     if (!(open(PROG,"$prog|"))) {
-        &log("warning: couldn't exec \"$prog\": $!\n");
+        &log("warning: couldn't exec $component as \"$prog\": $!\n");
         return -1;
     }
+
+    &log("\n>>>> Output from $component >>>>>\n");
 
     eval {
@@ -891 +893 @@
         close(PROG);
     };
+
+    &log("<<<<< End output from $component <<<<<\n\n");
+
     if ($@) {
         die unless $@ eq "alarm\n";   # propagate unexpected errors
 
         # timeout
-        &log("prog ran for $timeout seconds, stopping it.\n");
+        &log(ucfirst($component) . " ran for $timeout seconds, stopping it.\n");
         close(PROG);
     }
 
     if ($? == -1) {
-        &log("Failed to execute prog: $!\n");
+        &log("Failed to execute $component: $!\n");
         return -1;
     } elsif ($? & 127) {
-        &log((sprintf "prog died with signal %d, %s coredump\n",
-          ($? & 127),  (($? & 128) ? "with" : "without")));
+        &log((sprintf "%s died with signal %d, %s coredump\n",
+          ucfirst($component), ($? & 127),  (($? & 128) ? "with" : "without")));
         return $?;
-    } else {
-        &log((sprintf "prog exited with value %d\n", ($? >> 8)));
-        return ($? >> 8);
-    }
+    } elsif ($debug) {
+        &log((sprintf "%s exited with value %d\n", ucfirst($component), ($? >> 8)));
+    }
+    return ($? >> 8);
 }