Changeset 1086

Timestamp:

07/06/08 18:04:40 (5 years ago)

Author:

max

Message:

shepherd: Don't report MISSING_DATA for Shepherd beyond Day 6 (we still do report it for individual grabbers, if they claim to support further days); also tidy some logging messages.

Location:

trunk

Files:

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

trunk/applications/shepherd

@@ -2 +2 @@
 
 our $progname = 'shepherd';
-my $version = '1.3.16';
+my $version = '1.3.17';
 
 # tv_grab_au
@@ -1618 +1618 @@
     my ($component, $field, @rest) = @_;
 
+    &log("SHEPHERD: Set pending message: $component $field @rest\n") if ($debug);
     my $iteration = 0;
     my $componentname = $component;
@@ -2795 +2796 @@
     if ($used_grabbers == 0)
     {
-        &log("SHEPHERD: No valid grabbers installed/enabled!\n");
+        &log("SHEPHERD: No valid grabbers available for $grab_policy stage.\n");
     }
     elsif (!$data_satisfies_policy)
     {
-        &log("SHEPHERD: Ran through all grabbers but still have policy-violating gaps in data! :(\n");
+        &log("SHEPHERD: Ran through all grabbers but still have policy-violating gaps in data. :(\n");
     }
     elsif (!$data_found_all)
     {
-        &log("SHEPHERD: Unfillable micro-gaps exist in data!\n");
+        &log("SHEPHERD: Unfillable micro-gaps exist in data.\n");
     }
 }
@@ -2922 +2923 @@
  
         &log("SHEPHERD: Scoring grabbers on ability to efficiently provide needed data:\n");
-        &log("Only considering micro-grabbers.\n") if ($find_microgaps);
+        &log("SHEPHERD: Only considering micro-grabbers.\n") if ($find_microgaps);
         foreach (sort { $gscore->{$b} <=> $gscore->{$a} } keys %$gscore)
         {
@@ -2975 +2976 @@
 
         if (!$total) { # $grabber_policy ne "paytv"
-            &log("Unfillable timeslice\n\n");
+            &log("SHEPHERD: Unfillable timeslice.\n\n");
             add_timeslice_to_missing_unfillable();
         }
@@ -4178 +4179 @@
     my ($d, $proggy) = @_;
 
-    if (defined $d->{already_missing}) {
-        $d->{already_missing} .= sprintf "-%02d:%02d",
-          int($d->{already_missing_last} / 3600),
-          int(($d->{already_missing_last} % 3600) / 60)
-          if (defined $d->{already_missing_last});
+    if (defined $d->{already_missing}) 
+    {
+        if (defined $d->{already_missing_last})
+        {
+            $d->{already_missing} .= sprintf "-%02d:%02d",
+                                             int($d->{already_missing_last} / 3600),
+                                             int(($d->{already_missing_last} % 3600) / 60);
+        }
+
         push(@{($d->{missing_all})}, $d->{already_missing});
 
         $d->{already_missing_epoch} .= sprintf "-%d",$d->{already_missing_last_epoch};
 
-        # Don't append this missing period to the 'missing_all_epoch' string
-        # if it's a noncritical gap and we already know this grabber tends
-        # to have those (eg yahoo7widget). We can do this because at the
-        # grabber level 'missing_all_epoch' is used only for stats reporting, 
-        # not any further analysis.
-        unless (query_config($proggy, 'has_noncritical_gaps') and is_noncritical_gap($d->{already_missing_epoch}))
+        # $plugin_data -> 'missing_all_epoch' records MISSING_DATA for stats
+        # reporting. We don't want to be bothered by data holes that are:
+        # (a) 'Noncritical', and we already know this grabber tends
+        #     to have those (eg yahoo7widget); or
+        # (b) In Shepherd and Day 6 or higher. (This allows Shepherd to attempt
+        #     to fill a longer schedule -- e.g. 14 days -- but not throw a lot
+        #     of warnings if it fails to.)
+        unless
+           (( &query_config($proggy, 'has_noncritical_gaps') and &is_noncritical_gap($d->{already_missing_epoch}))
+                or
+            ( $proggy eq $progname and $d->{already_missing_epoch} =~ /(\d+)-/ and $1 > $policy{starttime} + (5*86400)))
         {
             $d->{missing_all_epoch} .= "," if (defined $d->{missing_all_epoch});

trunk/status

@@ -1 @@
-application     shepherd            1.3.16
+application     shepherd            1.3.17
 reference       channel_list        22
 reference       Shepherd/Common.pm  0.36