Merge branch 'master' of github.com:krebscode/painload

1 files changed, 6 insertions, 4 deletions

diff --git a/retiolum/scripts/adv_graphgen/parse_tinc_stats.py b/retiolum/scripts/adv_graphgen/parse_tinc_stats.py
index c02c9a84..410e5229 100755
--- a/retiolum/scripts/adv_graphgen/parse_tinc_stats.py
+++ b/retiolum/scripts/adv_graphgen/parse_tinc_stats.py
@@ -49,14 +49,14 @@ def write_stat_node(nodes):
 def generate_stats(nodes):
   """ Generates some statistics of the network and nodes
   """
+  jlines = []
   try:
     f = open(DUMP_FILE,'r')
+    for line in f:
+      jlines.append(json.loads(line))
     f.close()
   except Exception,e:
-    f = []
-  jlines = []
-  for line in f:
-    jlines.append(json.loads(line))
+    pass
   for k,v in nodes.iteritems():
     conns = v.get('to',[])
     v['num_conns'] = len(conns)
@@ -81,6 +81,8 @@ def get_node_availability(name,jlines):
   uptime = 0
   #sys.stderr.write ( "Getting Node availability of %s\n" % name)
   for stat in jlines:
+    if not stat['nodes']:
+      continue
     ts = stat['timestamp']
     if not begin:
       begin = last = ts