adding printing IPs to logreader

1 files changed, 41 insertions, 12 deletions

diff --git a/monitor/josef_logreader.py b/monitor/josef_logreader.py
index cac5812..12ffeaf 100755
--- a/monitor/josef_logreader.py
+++ b/monitor/josef_logreader.py
@@ -97,8 +97,22 @@ def print_errors(l):
             break # comment this line to print all errors ever
             pass
 
+def print_ips(l):
+    log = read_loglog(l)
+    ips = []
+    for item in log:
+        if "New Front end IP" in item:
+            ip = item.split()[-1]
+            if not ip in ips:
+                ips.append(ip)
+
+    print str(len(ips)) + " front end IPs seen:"
+    for i in ips:
+        print i
+
 def print_overlap(l):
     log = read_loglog(l)
+    print "Log: ", log
     source = log[0].split("[")[0].split()[-1]
     print "\nOverlaps in " + source + ":"
     entry_count = {}
@@ -136,7 +150,20 @@ def print_overlap(l):
         print e + ", " + str(metadata[e]) + " (" + str(int(100 * float(metadata[e])/float(total))) + "%)"
 
 def write_history_data(l):
+    if "overlap" in l:
+        return
+
     logfile = OUTPUT_DIR + l[:-4] + "_history.txt"
+
+    print "Looking for logfile..."
+    if os.path.exists(logfile):
+        os.remove(logfile)
+        print "Removing " + logfile
+    else:
+        print "Could not find " + logfile
+
+
+
     log = read_loglog(l)
     data = {}
     start_date = datetime.date(2015, 9, 29)
@@ -163,20 +190,21 @@ def write_history_data(l):
 
     # fill out missing data points and write to file
     with open(logfile, 'a') as f:
-        prev_val = 0
+        prev_size = 0
         for item in data_list:
             s = str(item[0])
-            if item[1] > prev_val:
-                val = item[1]
+
+            if int(item[1]) > prev_size:
+                val = int(item[1])
             else:
-                val = prev_val
+                val = prev_size
 
-            if prev_val == 0:
+            if prev_size == 0:
                 diff = 0
             else:
-                diff = val - prev_val
+                diff = int(val) - int(prev_size)
 
-            prev_val = val
+            prev_size = val
 
             s += " " + str(val)
             s += " " + str(diff)
@@ -197,17 +225,18 @@ if __name__ == "__main__":
     for log in logs:
         if log == "monitor.log":
             pass
-        elif log[- len(OVERLAP_STR):] == OVERLAP_STR:
-            print_overlap(log)
+        # elif log[- len(OVERLAP_STR):] == OVERLAP_STR:
+        #     print_overlap(log)
             pass
         else:
             pass
-            # print log
+            print log
             # print_log_stats(log)
             # print_average_age(log)
             # print_errors(log)
-            # print ""
-            write_history_data(log)
+            print_ips(log)
+            print ""
+            # write_history_data(log)