changing log timestamps to UTC

1 files changed, 10 insertions, 5 deletions

diff --git a/monitor/josef_logreader.py b/monitor/josef_logreader.py
index 622674d..05ee969 100755
--- a/monitor/josef_logreader.py
+++ b/monitor/josef_logreader.py
@@ -37,8 +37,8 @@ def print_log_stats(l):
     # Stats from last STH update
     for item in rev_log:
         line = item[TIME_LEN:]
-        # if line[:len(START_STR)] == START_STR:
-        #     break
+        if line[:len(START_STR)] == START_STR:
+            break
         if line[:len(NEW_STH_STR)] == NEW_STH_STR:
             timestamp = datetime.datetime.strptime(line[-20:-1], '%Y-%m-%d %H:%M:%S')
             age = datetime.datetime.utcnow() - timestamp
@@ -58,6 +58,7 @@ def print_average_age(l):
 
     prev_timestamp = None
     ages = []
+    delays = []
     for item in rev_log:
         line = item[TIME_LEN:]
         if line[:len(START_STR)] == START_STR:
@@ -65,13 +66,17 @@ def print_average_age(l):
             prev_timestamp = None # Don't count over restarts
         if line[:len(NEW_STH_STR)] == NEW_STH_STR:
             timestamp = datetime.datetime.strptime(line[-20:-1], '%Y-%m-%d %H:%M:%S')
+            time_seen = datetime.datetime.strptime(item[:TIME_LEN -1], '%Y-%m-%d %H:%M:%S')
+            delays.append(time_seen - timestamp)
             if prev_timestamp is not None:
                 ages.append(prev_timestamp - timestamp)
             prev_timestamp = timestamp
 
-    if len(ages) == 0:
-        print "No timedeltas found.."
-    else:
+    if not len(delays) == 0:
+        average_timedelta = sum(delays, datetime.timedelta(0)) / len(delays)
+        print "Average publish delay: " + str(average_timedelta) + " (" + str(len(delays)) + " values)"
+
+    if not len(ages) == 0:
         average_timedelta = sum(ages, datetime.timedelta(0)) / len(ages)
         print "Average update time: " + str(average_timedelta) + " (" + str(len(ages)) + " values)"