Changeset 705

Timestamp:

05/28/07 20:30:48 (6 years ago)

Author:

lincoln

Message:

keep proper history of runs

Files:

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

applications/shepherd

@@ -2 +2 @@
 
 my $progname = 'shepherd';
-my $version = '0.4.97';
+my $version = '0.4.98';
 
 # tv_grab_au
@@ -80 +80 @@
 my $last_successful_run;
 my $last_successful_run_data;
+my $last_successful_runs;
 my $components = { };
 my $components_pending_install = { };
@@ -89 +90 @@
 my $log_file = "$progname.log";
 my $sysid = time.".".$$;
-my $oldest_days = 30;
 my $pending_messages = { };
 my $starttime = time;
@@ -726 +726 @@
     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;
 }
 
@@ -890 +892 @@
     &log(2, "WARNING: ".ucfirst($progname)." is being run too frequently.\n");
 
-    if ($oldest_days <= 7) {
+    # enforce hard limit
+    my $num_runs = 0;
+    my $earliest_run = time;
+    foreach my $when (sort {$b <=> $a} keys %{$last_successful_runs}) {
+        if (($when + (86400*30)) < time) {
+            delete $last_successful_runs->{$when}; # age out old entries
+            next;
+        }
+
+        if ($when >= (time - (86400*7))) {
+            $num_runs++;
+            $earliest_run = $when if ($num_runs == 30);
+        }
+    }
+    if ($num_runs >= 30) {
         &log(2, "\n*** ERROR: EXTREME OVERUSE ***\n\n".
             "Shepherd has run more than 30 times in the last 7 days! To avoid overloading\n".
@@ -898 +914 @@
             "TO AVOID THIS ERROR: Please do not run Shepherd more than once or twice per\n".
             "day. Shepherd is now in a locked state. To unlock Shepherd, wait \n".
-            (8-$oldest_days)." days. Alternately, you may reinstall Shepherd.\n\n".
+            pretty_duration((7*86400)-(time-$earliest_run)).
+            ". Alternately, you may reinstall Shepherd.\n\n".
             "Please do not abuse Shepherd. All users depend on your courtesy.\n\n");
 
@@ -1058 +1075 @@
     # keep last 30 log files
     my $num;
-    my $found = 0;
-    $oldest_days = 0;
-
     for ($num = 30; $num > 0; $num--) {
         my $f1 = sprintf "%s/%s.%d.gz",$LOG_DIR,$log_file,$num;
@@ -1066 +1080 @@
         unlink($f2);
         rename($f1,$f2);
-
-        if (-s $f2) {
-            $found++;
-            $oldest_days = -M $f2 if ((-M $f2) > $oldest_days);
-        }
     }
 
@@ -1076 +1085 @@
     my $f2 = sprintf "%s/%s.1",$LOG_DIR,$log_file;
     rename($f1,$f2);
-
-    $oldest_days = 30 if ($found <= 28);
 }
 
@@ -1390 +1397 @@
 {
     write_file($config_file, 'configuration', 
-        [$region,  $pref_title_source,  $want_paytv_channels,  $sysid,  $last_successful_run, $last_successful_run_data, $mirror_site,  $components,  $components_pending_install,  $pending_messages ],
-        ["region", "pref_title_source", "want_paytv_channels", "sysid", "last_successful_run", "last_successful_run_data", "mirror_site", "components", "components_pending_install", "pending_messages" ]);
+        [$region,  $pref_title_source,  $want_paytv_channels,  $sysid,  $last_successful_run, $last_successful_run_data, $last_successful_runs, $mirror_site,  $components,  $components_pending_install,  $pending_messages ],
+        ["region", "pref_title_source", "want_paytv_channels", "sysid", "last_successful_run", "last_successful_run_data", "last_successful_runs", "mirror_site", "components", "components_pending_install", "pending_messages" ]);
 }
 
@@ -2196 +2203 @@
              ($ctype eq 'grabber' ?
                 "                         Enabled/\n".
-                sprintf(" %-17s Version Ready  Last Run  Status", ucfirst($ctype)) 
+                sprintf(" %-15s Version Ready  Last Run  Status", ucfirst($ctype)) 
                 : ucfirst($ctype)) .
-             "\n -------------- ---------- ----- ---------- -----------------------------------\n");
+             "\n ------------ ---------- ----- ---------- -------------------------------------\n");
         foreach (sort { ($components->{$b}->{lastdata} or 0) <=> ($components->{$a}->{lastdata} or 0) } query_component_type($ctype))
         {
             my $h = $components->{$_};
-            &log(sprintf  " %-15s%10s %1s/%1s%1s %11s %s\n",
-                 length($_) > 15 ? substr($_,0,13).".." : $_,
+            &log(sprintf  " %-13s%10s %1s/%1s%1s %11s %s\n",
+                 length($_) > 13 ? substr($_,0,11).".." : $_,
                  $h->{ver},
                  $h->{disabled} ? 'N' : 'Y',
@@ -2209 +2216 @@
                  (defined $plugin_data->{$_}->{tainted} ? "!" : ""),
                  pretty_date($h->{lastdata}),
-                 $h->{laststatus} ? pretty_print($h->{laststatus},35) : '');
+                 ((defined $h->{disabled} && $h->{disabled} == 2) ? "centrally disabled" :
+                     ($h->{laststatus} ? pretty_print($h->{laststatus},37) : '')));
         }
     }
@@ -2221 +2229 @@
                             $last_successful_run_data;
         }
-        &log("$str.\n");
+        &log("\n$str.\n");
+
+        $str = sprintf "  History of runs: ";
+        foreach my $when (sort {$b <=> $a} keys (%{$last_successful_runs})) {
+            $str .= pretty_duration(time - $when).
+                (sprintf "[%2.2f%%] ",$last_successful_runs->{$when});
+        }
+        &log("$str\n");
     }
     &log("\nPreferred titles from grabber '$pref_title_source'\n") if ($pref_title_source);

status

@@ -1 @@
-application     shepherd            0.4.97
+application     shepherd            0.4.98
 reference       channel_list        2
 reference       Shepherd/Common.pm  0.12