Changeset 146 for shepherd

Timestamp:

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

Author:

lincoln

Message:

minor policy changes, cosmetic cleanup of how we tell the user about missing data

Files:

• shepherd (modified) (11 diffs)

shepherd

@@ -89 +89 @@
 #  if there is more than this, we will continue asking grabbers for more
 #  programming on this channel
-$policy{peak_max_missing} = 10*60;              # up to 10 mins max allowed missing
+$policy{peak_max_missing} = 15*60;              # up to 15 mins max allowed missing
 $policy{peak_start} = (16*(60*60))+(30*60);     # 4.30pm
 $policy{peak_stop} = (23*(60*60))+(30*60);      # 11.30pm
@@ -103 +103 @@
 # all other timeslots -
 #  allow up to 45 minutes maximum missing programming
-$policy{other_max_missing} = 45*60;             # up to 45 mins max allowed missing
+$policy{other_max_missing} = 60*60;             # up to 60 mins max allowed missing
 
 # if a postprocessor failed 5 times in a row, automatically disable it
@@ -1007 +1007 @@
 
         my $data;
+        my $lastpol = "";
         $data->{data_ok} = 1; # unless proven otherwise
         $data->{have} = 0;
         $data->{missing} = 0;
-
-        my $already_missing = "";
-        my $already_missing_last = "";
 
         for my $slotnum (0..($policy{num_timeslots}-1)) {
@@ -1034 +1032 @@
 
                 # 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 = "";
-                }
+                &dump_already_missing($data);
             }
 
@@ -1049 +1040 @@
 
                 # 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 = "";
-                }
+                &dump_already_missing($data);
+
+                &dump_already_missing_period($data->{day}->[$day],$lastpol)
+                  if ($lastpol ne "");
 
                 $data->{day}->[$day]->{have} += $policy{timeslot_size};
@@ -1073 +1060 @@
 
             # store details of where we are missing data
-            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;
+            if (!defined $data->{already_missing}) {
+                $data->{already_missing} = sprintf "#%d/%02d:%02d",
+                  $day,
+                  int($bucket_seconds_offset / 3600),
+                  int(($bucket_seconds_offset % 3600) / 60);
             }
+            $data->{already_missing_last} = $bucket_seconds_offset + $policy{timeslot_size} - 1;
 
             $data->{day}->[$day]->{missing} += $policy{timeslot_size};
@@ -1085 +1072 @@
 
             # work out what policy missing data for this bucket fits into
+            my $pol;
             if (($bucket_seconds_offset >= $policy{peak_start}) &&
-                ($bucket_seconds_offset < $policy{peak_stop})) {
-                $data->{day}->[$day]->{missing_peak} += $policy{timeslot_size};
-                push(@{($data->{day}->[$day]->{missing_peak_table})}, $bucket_seconds_offset);
+                (($bucket_seconds_offset+$policy{timeslot_size}) <= $policy{peak_stop})) {
+                $pol = "peak";
             } elsif (($bucket_seconds_offset >= $policy{nonpeak_start}) &&
-                     ($bucket_seconds_offset < $policy{nonpeak_stop})) {
-                $data->{day}->[$day]->{missing_nonpeak} += $policy{timeslot_size};
-                push(@{($data->{day}->[$day]->{missing_nonpeak_table})}, $bucket_seconds_offset);
+                     (($bucket_seconds_offset+$policy{timeslot_size}) <= $policy{nonpeak_stop})) {
+                $pol = "nonpeak";
             } else {
-                $data->{day}->[$day]->{missing_other} += $policy{timeslot_size};
-                push(@{($data->{day}->[$day]->{missing_other_table})}, $bucket_seconds_offset);
+                $pol = "other";
             }
+
+            &dump_already_missing_period($data->{day}->[$day],$lastpol)
+              if (($lastpol ne $pol) && ($lastpol ne ""));
+
+            $lastpol = $pol;
+
+            $data->{day}->[$day]->{"missing_".$pol} += $policy{timeslot_size};
+
+            $data->{day}->[$day]->{"already_missing_".$pol."_start"} = $bucket_seconds_offset
+              if (!defined $data->{day}->[$day]->{"already_missing_".$pol."_start"});
+            $data->{day}->[$day]->{"already_missing_".$pol."_stop"} = $bucket_seconds_offset + $policy{timeslot_size} - 1;
 
             $data->{day}->[$day]->{day_ok} = 0 if ($data->{day}->[$day]->{missing_peak} > $policy{peak_max_missing});
@@ -1105 +1101 @@
         }
 
+        # finished all timeslots in this channel.
         # 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" : "");
+        &dump_already_missing($data);
+
+        # fill in any last missing period data
+        foreach my $day (@{($data->{day})}) {
+            &dump_already_missing_period($day,"peak");
+            &dump_already_missing_period($day,"nonpeak");
+            &dump_already_missing_period($day,"other");
+        }
+
+        my $statusstring = sprintf " > ch %s: %s programming: %s\n", 
+          $ch, pretty_duration($data->{have}),
+          $data->{data_ok} ? "PASS (within thresholds)" : "FAIL, missing data over policy threshold:";
 
         # display per-day missing data statistics
         foreach my $day (@{($data->{day})}) {
-            if ($day->{missing} > 0) {
-                $statusstring .= sprintf " #%d(",$day->{num};
+            unless ($day->{day_ok}) {
+                $statusstring .= sprintf "\t".(strftime("%a %e %b",localtime($policy{starttime}+($day->{num}*86400)))).": ";
 
                 # do we have any data for this day?
-                if ($day->{have}) {
-                    $statusstring .= sprintf "%s peak",pretty_duration($day->{missing_peak})
-                      if ($day->{missing_peak});
-
-                    $statusstring .= sprintf "%s%s non-peak",
-                      ($day->{missing_peak} ? ", " : ""),
-                      pretty_duration($day->{missing_nonpeak},$policy{nonpeak_max_missing})
-                      if ($day->{missing_nonpeak});
-
-                    $statusstring .= sprintf "%s%s other",
-                      (($day->{missing_peak} + $day->{missing_nonpeak}) > 0 ? ", " : ""),
-                      pretty_duration($day->{missing_other},$policy{other_max_missing})
-                      if ($day->{missing_other} > 0);
-                } else {
-                    $statusstring .= "all[!]";
-                }
-
-                $statusstring .= ")";
+                $statusstring .= "peak ".join(", ",(@{($day->{missing_peak_table})}))
+                  if (($day->{missing_peak}) && ($day->{missing_peak} > $policy{peak_max_missing}));
+
+                $statusstring .= sprintf "%snon-peak %s",
+                  ($day->{missing_peak} ? " / " : ""),
+                  join(", ",(@{($day->{missing_nonpeak_table})}))
+                  if (($day->{missing_nonpeak}) && ($day->{missing_nonpeak} > $policy{nonpeak_max_missing}));
+
+                $statusstring .= sprintf "%sother %s",
+                  (($day->{missing_peak} + $day->{missing_nonpeak}) > 0 ? " / " : ""),
+                  join(", ",(@{($day->{missing_other_table})}))
+                  if (($day->{missing_other}) && ($day->{missing_other} > $policy{other_max_missing}));
+
+                $statusstring .= "\n";
             }
         }
-        &log(" > $statusstring\n") unless $quiet;
-
-        &log("[debug] Missing the following bucket slots for this $ch: ".
-          join(" ",(@{($data->{missing_all})}))."\n")
-          if ($data->{missing} > 0);
+        &log($statusstring) unless $quiet;
 
         delete $channel_data->{$ch}->{analysis} if (defined $channel_data->{$ch}->{analysis});
@@ -1156 +1145 @@
 
     &log((sprintf " > OVERALL: %s\n", ($overall_data_ok ? "PASS" : "FAIL"))) unless $quiet;
+
     return $overall_data_ok; # return 1 for good, 0 for need more
 }
 
+# helper routine for filling in 'missing_all' array
+sub dump_already_missing
+{
+    my $d = shift;
+    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});
+        push(@{($d->{missing_all})}, $d->{already_missing});
+        delete $d->{already_missing};
+        delete $d->{already_missing_last};
+    }
+}
+
+# helper routine for filling in per-day missing data
+# specific to peak/nonpeak/other
+sub dump_already_missing_period
+{
+    my ($d,$p) = @_;
+    my $startvar = "already_missing_".$p."_start";
+    my $stopvar = "already_missing_".$p."_stop";
+
+    if (defined $d->{$startvar}) {
+        push(@{($d->{"missing_".$p."_table"})},
+          sprintf "%02d:%02d-%02d:%02d",
+            int($d->{$startvar} / 3600),
+            int(($d->{$startvar} % 3600) / 60),
+            int($d->{$stopvar} / 3600),
+            int(($d->{$stopvar} % 3600) / 60));
+        delete $d->{$startvar};
+        delete $d->{$stopvar};
+    }
+}
 
 # given a duration (seconds), return it in a pretty "{days}d{hr}h{min}m" string
@@ -1166 +1190 @@
     my ($d,$crit) = @_;
     my $s = "";
-    $s .= sprintf "%dd",int($d / (60*60*24)) if ($d > (60*60*24));
-    $s .= sprintf "%dh",int(($d % (60*60*24)) / (60*60)) if (($d % (60*60*24)) > (60*60));
-    $s .= sprintf "%dm",int(($d % (60*60)) / 60) if (($d % (60*60)) > 60);
-    $s .= "no data[!]" if ($s eq "");
+    $s .= sprintf "%dd",int($d / (60*60*24)) if ($d >= (60*60*24));
+    $s .= sprintf "%dh",int(($d % (60*60*24)) / (60*60)) if (($d % (60*60*24)) >= (60*60));
+    $s .= sprintf "%dm",int(($d % (60*60)) / 60) if (($d % (60*60)) >= 60);
+    $s .= "no" if ($s eq "");
 
     if (defined $crit) {
@@ -1776 +1800 @@
     printf "Logging to $log_file.\n";
     open(LOG_FILE,">$log_file") || die "can't open log file $log_file for writing: $!\n";
+
+    my $now = localtime(time);
+    printf LOG_FILE "$progname version $version started at $now\n\n";
 }