Changeset 145

Timestamp:

10/25/06 06:19:25 (7 years ago)

Author:

lincoln

Message:

more missing_data debugging added

Files:

• shepherd (modified) (17 diffs)
• status (modified) (1 diff)

shepherd

@@ -3 +3 @@
 # "Shepherd"
 
-my $version = '0.2.24';
+my $version = '0.2.25';
 
 # A wrapper for various Aussie TV guide data grabbers
@@ -37 +37 @@
 #           explicitly tell reconciler the preferred _title_ source
 # 0.2.24  : logging and log files
+# 0.2.25  : use open-with-pipe rather than system() and look at
+#           return codes from called programmes
 
 BEGIN { *CORE::GLOBAL::die = \&my_die; }
@@ -202 +204 @@
 }
 
-unless ($opt->{nolog}) {
-    &rotate_logfiles;
-    open(LOG_FILE,">$log_file") || die "can't open log file $log_file for writing: $!\n";
-}
+&open_logfile unless ($opt->{nolog});
 
 # ---------------------------------------------------------------------------
@@ -323 +322 @@
         $comm .= " @ARGV" if (@ARGV);
 
+        my $retval = 0;
         if ((defined $opt->{dontcallgrabbers}) && ($opt->{dontcallgrabbers})) {
             &log("SHEPHERD: not calling grabber because of --dontcallgrabbers option, but will instead use existing $output\n");
@@ -329 +329 @@
             &log("SHEPHERD: Excuting command: $comm\n");
             chdir "$CWD/grabbers/$grabber/";
-            system($comm);
+            $retval = call_prog($comm);
             chdir $CWD;
+        }
+
+        if ($retval != 0) {
+            &log("grabber returned with non-zero return code $retval: assuming it failed.\n");
+            next;
         }
 
@@ -1006 +1011 @@
         $data->{missing} = 0;
 
+        my $already_missing = "";
+        my $already_missing_last = "";
+
         for my $slotnum (0..($policy{num_timeslots}-1)) {
             my $bucket_start_offset = ($slotnum * $policy{timeslot_size});
@@ -1024 +1032 @@
 
                 $data->{day}->[$day]->{day_ok} = 1; # until proven otherwise
+
+                # day changed, dump any 'already_missing' data
+                if ($already_missing ne "") {
+                    $already_missing .= sprintf "-%02d:%02d",
+                      int($already_missing_last/3600),int(($already_missing_last%3600)/60)
+                      if ($already_missing_last ne "");
+                    push(@{($data->{missing_all})}, $already_missing);
+                    $already_missing = "";
+                    $already_missing_last = "";
+                }
             }
 
@@ -1029 +1047 @@
             if ((defined $channel_data->{$ch}->{timeslots}[$slotnum]) &&
                 ($channel_data->{$ch}->{timeslots}[$slotnum] > 0)) {
+
+                # if we have missing data queued up, push it now
+                if ($already_missing ne "") {
+                    $already_missing .= sprintf "-%02d:%02d",
+                      int($already_missing_last/3600),int(($already_missing_last%3600)/60)
+                      if ($already_missing_last ne "");
+                    push(@{($data->{missing_all})}, $already_missing);
+                    $already_missing = "";
+                    $already_missing_last = "";
+                }
+
                 $data->{day}->[$day]->{have} += $policy{timeslot_size};
                 $data->{have} += $policy{timeslot_size};
@@ -1044 +1073 @@
 
             # store details of where we are missing data
-            push(@{($data->{missing_all})}, "$day:$bucket_seconds_offset");
+            if ($already_missing eq "") {
+                $already_missing = sprintf "#%d/%02d:%02d", $day,
+                      int($bucket_seconds_offset/3600),int(($bucket_seconds_offset%3600)/60);
+                $already_missing_last = $bucket_seconds_offset + $policy{timeslot_size} - 1;
+            } else {
+                $already_missing_last = $bucket_seconds_offset + $policy{timeslot_size} - 1;
+            }
+
             $data->{day}->[$day]->{missing} += $policy{timeslot_size};
             $data->{missing} += $policy{timeslot_size};
@@ -1069 +1105 @@
         }
 
-        my $statusstring = sprintf "ch %s: have %s (%s)%s", 
+        # if we have missing data queued up, push it now
+        if ($already_missing ne "") {
+            $already_missing .= sprintf "-%02d:%02d",
+              int($already_missing_last/3600),int(($already_missing_last%3600)/60)
+              if ($already_missing_last ne "");
+            push(@{($data->{missing_all})}, $already_missing);
+            $already_missing = "";
+            $already_missing_last = "";
+        }
+
+        my $statusstring = sprintf "ch %s: %s (%s)%s", 
           $ch, pretty_duration($data->{have}), $data->{data_ok} ? "pass" : "fail",
           ($data->{missing} ? " missing" : "");
@@ -1093 +1139 @@
                       if ($day->{missing_other} > 0);
                 } else {
-                    $statusstring .= "all";
+                    $statusstring .= "all[!]";
                 }
 
@@ -1100 +1146 @@
         }
         &log(" > $statusstring\n") unless $quiet;
+
+        &log("[debug] Missing the following bucket slots for this $ch: ".
+          join(" ",(@{($data->{missing_all})}))."\n")
+          if ($data->{missing} > 0);
 
         delete $channel_data->{$ch}->{analysis} if (defined $channel_data->{$ch}->{analysis});
@@ -1331 +1381 @@
     my $dir = sprintf "%s/%ss/%s/",$CWD,$data_processor_type,$data_processor_name;
     chdir $dir;
-    system($comm);
+    my $retval = call_prog($comm);
     chdir $CWD;
+
+    if ($retval != 0) {
+        &log("$data_processor_type returned with non-zero return code $retval: assuming it failed.\n");
+        return 0;
+    }
 
     #
@@ -1498 +1553 @@
 
     # Make component executable
-    system('chmod u+x ' . $newfile);
+    chmod 0755,$newfile;
 
     -d $ARCHIVE_DIR or mkdir $ARCHIVE_DIR or die "Cannot create directory $ARCHIVE_DIR: $!";
@@ -1562 +1617 @@
 
     chdir($testdir);
-    system("$proggyexec --ready");
+    my $result = call_prog("$proggyexec --ready");
     chdir ($CWD);
 
-    my $result = $?;
     print "Return value: $result\n" if ($debug);
 
@@ -1717 +1771 @@
 }
 
+sub open_logfile
+{
+    &rotate_logfiles;
+    printf "Logging to $log_file.\n";
+    open(LOG_FILE,">$log_file") || die "can't open log file $log_file for writing: $!\n";
+}
+
 sub close_logfile
 {
@@ -1727 +1788 @@
     my $entry = shift;
     print $entry;
-    printf LOG_FILE "%s %s",time,$entry unless $opt->{nolog};
-}
-
+    printf LOG_FILE "%s",$entry unless $opt->{nolog};
+}
+
+sub call_prog
+{
+    my $prog = shift;
+    if (!(open(PROG,"$prog|"))) {
+        &log("warning: couldn't exec \"$prog\": $!\n");
+        return -1;
+    }
+    while(<PROG>) {
+        &log($_);
+    }
+    close(PROG);
+
+    if ($? == -1) {
+        &log("Failed to execute prog: $!\n");
+        return -1;
+    } elsif ($? & 127) {
+        &log((sprintf "prog died with signal %d, %s coredump\n",
+          ($? & 127),  ($? & 128) ? "with" : "without"));
+        return $?;
+    } else {
+        &log((sprintf "prog exited with value %d\n", $? >> 8));
+        return ($? >> 8);
+    }
+}
 
 # -----------------------------------------

status

@@ -1 @@
-shepherd:0.2.24:shepherd
+shepherd:0.2.25:shepherd
 grabber:rex:3.3.5-r2
 grabber:oztivo:0.8-r2