Changeset 1083 for trunk/util/server_daily_maint

Timestamp:

07/03/08 17:43:37 (5 years ago)

Author:

max

Message:

stats: wasn't rolling over day properly

Files:

• trunk/util/server_daily_maint (modified) (2 diffs)

trunk/util/server_daily_maint

@@ -30 +30 @@
 use HTML::Template;
 use Time::Local;
-use Date::Manip;
 
 my $stats_file = $store_dir . "/stats.config";
@@ -152 +151 @@
     return unless ($store->{last_run});
 
-    my $last_run = &Date::Manip::ParseDateString("epoch " . $store->{last_run});
-    my $now = &Date::Manip::ParseDate("epoch $starttime");
-    my $weekdiffstr = &Date::Manip::DateCalc($last_run, $now);
-    my $monthdiffstr = &Date::Manip::DateCalc($last_run, $now, undef, 1);
-
-    my $months_since = (($monthdiffstr =~ /(\d+):(\d+):/) && ($1 * 12 + $2));
-    &rollover_units('month', $months_since);
-
-    my $weeks_since = (($weekdiffstr =~ /0:0:(\d+):/) && $1);
-    &rollover_units('week', $weeks_since);
-
-    my $days_since = (($weekdiffstr =~ /0:0:(\d+):(\d+):/) && ($1 * 7 + $2));
-    &rollover_units('day', $days_since);
-
-    my $hours_since = (($weekdiffstr =~ /0:0:(\d+):(\d+):(\d+):/) && ($1 * 168 + $2 * 24 + $3));
-    &rollover_units('hour', $hours_since);
-
-#    print "Finished; per_hour 1 is: " . Dumper($store->{per_hour}->[1]) . "\n"; die;
+    my @llast = localtime($store->{last_run});
+    my @lnow = localtime($starttime);
+
+    # Figure out the difference. This is a little trickier than you
+    # might think, since we want to know not how much time has
+    # elapsed, but the difference in month/week/day/hour number.
+    # For example, it may be 2 hours since we last ran, but if
+    # we last ran at 11PM and it's now 1AM, we are in a new day
+    # number.
+
+    my $yrdiff = $lnow[5] - $llast[5]; 
+    my $modiff = (12 * $yrdiff) + $lnow[4] - $llast[4];
+    my $weekdiff = ($yrdiff * 52) + strftime("%U", @lnow) - strftime("%U", @llast);
+    my $daydiff = ($yrdiff * 365) + $lnow[7] - $llast[7];
+    my $hrdiff = int($starttime / 3600) - int($store->{last_run} / 3600);
+
+    &rollover_units('month', $modiff);
+    &rollover_units('week', $weekdiff);
+    &rollover_units('day', $daydiff);
+    &rollover_units('hour', $hrdiff);
 }