Changeset 877

Timestamp:

07/23/07 22:04:08 (6 years ago)

Author:

max

Message:

shepherd: flag as FAIL when grabbers return unparseable XMLTV. (Suspect machine-specific issue with xmltv_parse_date, but not sure yet.) Also add --skippost option and don't count --dontcallgrabbers runs in history.

Files:

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

applications/shepherd

@@ -2 +2 @@
 
 my $progname = 'shepherd';
-my $version = '1.2.0';
+my $version = '1.2.1';
 
 # tv_grab_au
@@ -227 +227 @@
     if ($any_data)
     {
-        &postprocess_data;
+        &postprocess_data unless ($opt->{skippost});
         &output_data;
         &finalize_stats;
@@ -750 +750 @@
     delete $pending_messages->{$progname}->{FAIL};
     &add_pending_message($progname, "SUCCESS", $sysid, $starttime, (time-$starttime), $region, $components_used);
-    $last_successful_run = time;
-    my $total_wanted = $plugin_data->{$progname}->{total_duration} + $plugin_data->{$progname}->{total_missing};
-    $last_successful_run_data = ($total_wanted ? 100* $plugin_data->{$progname}->{total_duration} / $total_wanted : 0);
-
-    $last_successful_runs->{$last_successful_run} = $last_successful_run_data;
+    unless ($opt->{dontcallgrabbers})
+    {
+        $last_successful_run = time;
+        my $total_wanted = $plugin_data->{$progname}->{total_duration} + $plugin_data->{$progname}->{total_missing};
+        $last_successful_run_data = ($total_wanted ? 100* $plugin_data->{$progname}->{total_duration} / $total_wanted : 0);
+
+        $last_successful_runs->{$last_successful_run} = $last_successful_run_data;
+    }
 }
 
@@ -774 +777 @@
     {
         &log("Not posting usage statistics due to --" . ($opt->{nonotify} ? 'nonotify' : 'dontcallgrabbers' ) . " option.\n");
+        &log("Would have posted: ".Dumper($pending_messages)) if ($debug);
     }
     else
@@ -1551 +1555 @@
                         noupdate
                         skipupdate
+                        skippost
                         disable=s
                         enable=s
@@ -2794 +2799 @@
         my $msg;
         my $component_start = time;
-        if ((defined $opt->{dontcallgrabbers}) && ($opt->{dontcallgrabbers})) {
+        if ($grabber eq 'yahoo7widget' or (defined $opt->{dontcallgrabbers}) && ($opt->{dontcallgrabbers})) {
             &log("SHEPHERD: not calling grabber because of --dontcallgrabbers option, but will instead use existing $output\n");
             &log(1, "SHEPHERD: would have called: $comm\n");
@@ -3646 +3651 @@
     my $xmltv = $this_plugin->{xmltv};
     my ($encoding, $credits, $chan, $progs) = @$xmltv;
-    $this_plugin->{total_duration} = 0;
-    $this_plugin->{programmes} = 0;
-    $this_plugin->{progs_with_invalid_date} = 0;        # explicitly track unparsable dates
-    $this_plugin->{progs_too_long} = 0;                 # explicitly track exxcessive programme durations
-    $this_plugin->{progs_with_unknown_channel} = 0;     # explicitly track unknown channels
+
+    # explicitly track unparsable dates, excessive durations, etc
+    foreach ( qw( programmes total_duration progs_with_invalid_date progs_too_long progs_too_short progs_with_unknown channel progs_outside_window))
+    {
+        $this_plugin->{$_} = 0;
+    }
 
     my $seen_channels_with_data = 0;
@@ -3706 +3712 @@
             if ($this_duration < 1) {
                 &log(sprintf "- WARNING: plugin '%s' returned programme data with invalid duration (%s to %s): ignored.\n", $pluginname, $prog->{start}, $prog->{stop});
+                $this_plugin->{progs_too_short}++;
                 next;
             }
@@ -3725 +3732 @@
 
                 # programme is outside the timeslots we are interested in.
-                next if ($t1 > $policy{endtime});
-                next if ($t2 < $policy{starttime});
+                if ($t1 > $policy{endtime} or $t2 < $policy{starttime})
+                {
+                    $this_plugin->{progs_outside_window}++;
+                    next;
+                }
 
                 # store timeslot info
@@ -3747 +3757 @@
                     $channel_data->{$ch}->{timeslots}[$slotnum]++;
                     $this_plugin->{timeslots}->{$ch}[$slotnum]++;
+                    $this_plugin->{slots_filled}++;
                 }
             }
@@ -3769 +3780 @@
         (defined $this_plugin->{earliest_data_seen} ? POSIX::strftime("%a%d%b", localtime($this_plugin->{earliest_data_seen})) : 'no'),
         (defined $this_plugin->{latest_data_seen} ? POSIX::strftime("%a%d%b", localtime($this_plugin->{latest_data_seen})) : 'data');
+
+    if (!$this_plugin->{slots_filled})
+    {
+        # Call this a failure if there was some kind of weirdness. If
+        # the grabber genuinely couldn't retrieve any shows for the 
+        # requested period, that's MISSING_DATA, but if it did and
+        # we couldn't understand them, that's a FAIL.
+
+        if ($this_plugin->{progs_with_invalid_date}
+                or
+            $this_plugin->{progs_too_long}
+                or
+            $this_plugin->{progs_too_short}
+                or
+            $this_plugin->{progs_outside_window}
+                or
+            $this_plugin->{progs_with_unknown_channel})
+        {
+            $this_plugin->{valid} = 0;
+            $this_plugin->{failure_reason} = 
+                sprintf "Unparseable: %d ch, %d shows, %d dur, %d slots, %d invalid_date, %d too_long, %d too_short, %d outside_window, %d unknown_channel",
+                    $seen_channels_with_data, 
+                    $this_plugin->{programmes},
+                    $this_plugin->{total_duration},
+                    $this_plugin->{slots_filled},
+                    $this_plugin->{progs_with_invalid_date},
+                    $this_plugin->{progs_too_long},
+                    $this_plugin->{progs_too_short},
+                    $this_plugin->{progs_outside_window},
+                    $this_plugin->{progs_with_unknown_channel};
+        }
+    }
 
     $plugin_data->{$plugin} = $this_plugin;

status

@@ -1 @@
-application     shepherd            1.2.0
+application     shepherd            1.2.1
 reference       channel_list        4
 reference       Shepherd/Common.pm  0.23