Changeset 413

Timestamp:

01/02/07 22:35:16 (6 years ago)

Author:

lincoln

Message:

seperate out call_prog's overloading of $retval into two variables.
this was causing expressions which expected a numeric $retval to succeed
where they shouldn't have.

e.g. a shepherd.log from a user indicated shepherd was accepting the output from a failed plugin even though it shouldn't have:

SHEPHERD: Using postprocessor: augment_timezone
SHEPHERD: Excuting command: /home/mythtv/.shepherd/postprocessors/augment_timezone/augment_timezone --region 73 --channels_file /home/mythtv/.shepherd/channels.conf --output /home/mythtv/.shepherd/postprocessors/augment_timezone/output.xmltv --days 7 /home/mythtv/.shepherd/reconcilers/reconciler_mk2/output.xmltv

:::::: Output from augment_timezone
: adjust_timezone v0.04
: Not a SCALAR reference at /home/mythtv/.shepherd/postprocessors/augment_timezone/augment_timezone line 110.
:::::: End output from augment_timezone

SHEPHERD: Warning: plugin 'augment_timezone' output file '/home/mythtv/.shepherd/postprocessors/augment_timezone/output.xmltv' does not exist
SHEPHERD: accepting output from postprocessor augment_timezone, feeding it into next stage

whereas it should have rejected it up-front.

resolves bugs introduced in [401], [406] and [410].

Files:

• applications/shepherd (modified) (12 diffs)
• status (modified) (1 diff)

applications/shepherd

@@ -2 +2 @@
 
 my $progname = 'shepherd';
-my $version = '0.4.28';
+my $version = '0.4.29';
 
 # tv_grab_au
@@ -450 +450 @@
     
     chdir($ldir);
-    my ($result,$test_output) = call_prog($proggy, $progname." $opt_ready"." 2>&1",1,1,0);
+    my ($result,$resultmsg,$test_output) = call_prog($proggy, $progname." $opt_ready"." 2>&1",1,1,0);
     chdir ($CWD);
 
@@ -465 +465 @@
 
         # set proggy status accordingly
-        my ($res, $reason) = split(/:/,$result);
         $statusmsg = sprintf "FAILED (return code %d%s) on %s",
-            $res,
-            ($reason eq "" ? "" : ", reason '$reason'"),
+            $result,
+            ($resultmsg eq "" ? "" : ", '$resultmsg'"),
             POSIX::strftime("%a%d%b%y", localtime(time));
 
@@ -937 +936 @@
     if (!(open(PROG,"$prog 2>&1|"))) {
         &log("warning: couldn't exec $component as \"$prog\": $!\n");
-        return(-1,$prog_output);
+        return(-1,"open failed",$prog_output);
     }
 
@@ -972 +971 @@
     if ($? == -1) {
         &log("Failed to execute $component: $!\n");
-        return ("-1:Failed to execute",$prog_output);
+        return (-1,"Failed to execute",$prog_output);
     }
     if ($msg)
@@ -985 +984 @@
         &log((sprintf "%s died with signal %d, %s coredump\n",
              ucfirst($component), ($? & 127),  (($? & 128) ? "with" : "without")));
-        return sprintf("%d:Died:%s", ($? & 127), $msg);
+        return (($? & 127), "Died:$msg", $prog_output);
     } 
     &log((sprintf "%s exited with value %d\n", ucfirst($component), ($? >> 8))) if ($debug);
 
-    return (0,$prog_output) unless ($? >> 8);
-    return (sprintf("%d:%s", ($? >> 8), $msg),$prog_output);
+    return (0,"",$prog_output) unless ($? >> 8);
+    return (($? >> 8), $msg, $prog_output);
 }
 
@@ -1769 +1768 @@
 
         my $retval = 0;
+        my $msg;
         my $component_start = time;
         if ((defined $opt->{dontcallgrabbers}) && ($opt->{dontcallgrabbers})) {
@@ -1776 +1776 @@
             &log("SHEPHERD: Excuting command: $comm\n");
             chdir "$CWD/grabbers/$grabber/";
-            $retval = call_prog($grabber,$comm,0,(query_config($grabber,'max_runtime')*60));
+            ($retval,$msg) = call_prog($grabber,$comm,0,(query_config($grabber,'max_runtime')*60));
             chdir $CWD;
         }
@@ -1782 +1782 @@
 
         if ($retval) {
-            my ($code, $msg) = split(/:/, $retval);
-            &log("Grabber exited with non-zero code $code: assuming it failed.\n" .
+            &log("Grabber exited with non-zero code $retval: assuming it failed.\n" .
                  "Last message: \"$msg\"\n");
-            $components->{$grabber}->{laststatus} = "Failed (code $code)";
+            $components->{$grabber}->{laststatus} = "Failed (code $retval)";
             $components->{$grabber}->{consecutive_failures}++;
-            &add_pending_message($grabber,"FAIL", $retval, $component_start, $component_duration, 
+            &add_pending_message($grabber,"FAIL", $retval.":".$msg, $component_start, $component_duration, 
                 $components->{$grabber}->{ver}, $components->{$grabber}->{consecutive_failures});
             next;
@@ -3039 +3038 @@
     my $dir = sprintf "%s/%ss/%s/",$CWD,$data_processor_type,$data_processor_name;
     chdir $dir;
-    my $retval = call_prog($data_processor_name,$comm,0,(query_config($data_processor_name,'max_runtime')*60));
+    my ($retval,$msg) = call_prog($data_processor_name,$comm,0,(query_config($data_processor_name,'max_runtime')*60));
     chdir $CWD;
     my $component_duration = time - $component_start;
 
     if ($retval) {
-        my ($code, $msg) = split(/:/, $retval);
-        &log("$data_processor_type exited with non-zero code $code: assuming it failed.\n" .
+        &log("$data_processor_type exited with non-zero code $retval: assuming it failed.\n" .
              "Last message: $msg\n");
-        $components->{$data_processor_name}->{laststatus} = "Failed ($code)";
+        $components->{$data_processor_name}->{laststatus} = "Failed ($retval)";
         $components->{$data_processor_name}->{consecutive_failures}++;
-        &add_pending_message($data_processor_name,"FAIL", $retval, $component_start, $component_duration,
+        &add_pending_message($data_processor_name,"FAIL", $retval.":".$msg, $component_start, $component_duration,
             $components->{$data_processor_name}->{ver}, $components->{$data_processor_name}->{consecutive_failures});
         return 0;
@@ -3070 +3068 @@
     # process and analyze it!
     &soak_up_data($data_processor_name, $output, $data_processor_type);
-    my $have_all_data = &analyze_plugin_data("$data_processor_type $data_processor_name",0,$data_processor_name);
+
+    my $have_all_data = 0;
+    if ((defined $plugin_data->{$data_processor_name}) &&
+        (defined $plugin_data->{$data_processor_name}->{valid})) {
+        $have_all_data = &analyze_plugin_data("$data_processor_type $data_processor_name",0,$data_processor_name);
+    }
 
     if ($have_all_data) {
@@ -3082 +3085 @@
         $components->{$data_processor_name}->{laststatus} = "missing data: ".$plugin_data->{$data_processor_name}->{laststatus};
         $components->{$data_processor_name}->{consecutive_failures}++;
-        &add_pending_message($data_processor_name,"FAIL", $retval, $component_start, $component_duration,
+        &add_pending_message($data_processor_name,"FAIL", $retval.":".$msg, $component_start, $component_duration,
             $components->{$data_processor_name}->{ver}, $components->{$data_processor_name}->{consecutive_failures});
     }

status

@@ -1 @@
-application     shepherd            0.4.28
+application     shepherd            0.4.29
 grabber         yahoo7widget        1.71
 grabber         rex                 3.3.8