Changeset 525

Timestamp:

02/15/07 16:03:08 (6 years ago)

Author:

max

Message:

Tidy up logging, include requested gaps in debug output.

Files:

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

applications/shepherd

@@ -2 +2 @@
 
 my $progname = 'shepherd';
-my $version = '0.4.50';
+my $version = '0.4.51';
 
 # tv_grab_au
@@ -1198 +1198 @@
     print FN Data::Dumper->Dump($vars, $varnames);
     close FN;
-    &log(1, "Wrote $name file $fn.\n");
+    &log(1, "SHEPHERD: Wrote $name file $fn.\n");
 }
 
@@ -1818 +1818 @@
 {
     my $used_grabbers = 0;
-    &log("\nGrabber stage.\n");
+    &log("\nSHEPHERD: Grabber stage.\n");
 
     &analyze_plugin_data("",1,$progname);    
@@ -1848 +1848 @@
         if (query_config($grabber, 'category') == 1)
         {
-            &log("SHEPHERD: Asking $grabber for " . display_best_timeslice());
+            &log("SHEPHERD: Asking $grabber for " . 
+                 ($find_microgaps ? 'microgaps within ' : '') .
+                 display_best_timeslice());
 
             record_requested_chandays($grabber, $timeslice);
@@ -1886 +1888 @@
             {
                 my $tmpgf = "$CWD/gaps.tmp";
-                record_requested_gaps($tmpgf, $timeslice, $grabber);
+                my $gapstr = record_requested_gaps($tmpgf, $timeslice, $grabber);
                 $comm .= " --gaps_file $tmpgf";
+                &log(1, "SHEPHERD: Asking $grabber to fill gaps: $gapstr\n");
             }
         }
@@ -1961 +1964 @@
         my @grabbed = $list->get_symmetric_difference();
         &log("SHEPHERD: Filled " . scalar(@grabbed) . " channel-days with new data from $grabber.\n");
-        &log(1, "Channel-days acquired: " . join (', ', @grabbed) . ".\n");
+        &log(1, "SHEPHERD: Channel-days acquired: " . join (', ', @grabbed) . ".\n");
 
         # Record what we grabbed from cacheable C1 grabbers
@@ -1980 +1983 @@
     if ($used_grabbers == 0)
     {
-        &log("No valid grabbers installed/enabled!\n");
+        &log("SHEPHERD: No valid grabbers installed/enabled!\n");
     }
     elsif (!$data_satisfies_policy)
@@ -2036 +2039 @@
     $timeslice = find_best_timeslice();
 
-    &log(1, "Best timeslice: " . display_best_timeslice());
+    &log(1, "SHEPHERD: Best timeslice: " . display_best_timeslice());
 
     my $total = score_grabbers();
@@ -2480 +2483 @@
 
     my $gaps;
+    my $gapstr = '';
 
     # Clear any previously-set gaps
@@ -2508 +2512 @@
             }
         }
+        $gapstr .= "$ch:" . join(',', @{$gaps->{$ch}}) . ' ' if ($gaps->{$ch});
     }
 
     write_file($fn, 'temporary gaps file', [ $gaps ], [ 'gaps' ]);
+
+    return $gapstr;
 }
 
@@ -2519 +2526 @@
     my ($grabber, @grabbed) = @_;
 
-    &log(1, "Recording cache for grabber $grabber.\n");
+    &log(1, "SHEPHERD: Recording cache for grabber $grabber.\n");
 
     my $gcache = $components->{$grabber}->{cached};
@@ -2571 +2578 @@
     my ($grabber, $slice) = @_;
 
-    &log(1, "Recording timeslice request; will not request these chandays " .
+    &log(1, "SHEPHERD: Recording timeslice request; will not request these chandays " .
             "from $grabber again.\n");
 
@@ -3268 +3275 @@
     # first time around: feed in reconciled data ($input_postprocess_file)
 
-    &log("\nPostprocessing stage:\n");
+    &log("\nSHEPHERD: Postprocessing stage:\n");
 
     foreach my $postprocessor (sort { $components->{$a} <=> $components->{$b} } query_postprocessors()) {

status

@@ -1 @@
-application     shepherd            0.4.50
+application     shepherd            0.4.51
 grabber         yahoo7widget        1.79
 grabber         rex                 3.4.2