From 02cddb0f98d00a815b017203c5b4399a567686bb Mon Sep 17 00:00:00 2001
From: Thomas Hooge <pirat@hoogi.de>
Date: Fri, 6 Jan 2017 18:58:35 +0100
Subject: [PATCH] Fixed statistics creation, improved argument handling, create
 image path only if needed

---
 backend.py   | 15 ++++++++++-----
 lib/rrddb.py | 11 ++++++-----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/backend.py b/backend.py
index 8b5541d..7b328d4 100755
--- a/backend.py
+++ b/backend.py
@@ -6,6 +6,8 @@ https://github.com/ffnord/ffmap-backend
 Erweiterte Version von Freifunk Pinneberg
   - Graphiken aus RRD-Daten nur auf Anforderung erzeugen
   - Verzeichnis für die RRD-Nodedb als Kommandozeilenparameter
+  - Statistikerzeugung korrigiert: Initialisierung und Befüllung
+    zu passenden Zeitpunkten
 
 """
 import argparse
@@ -93,9 +95,8 @@ def main(params):
             nodes.import_nodeinfo(nodedb['nodes'], nodeinfo,
                                   now, assume_online=False)
 
+    # prepare statistics collection
     nodes.reset_statistics(nodedb['nodes'])
-    for alfred in alfred_instances:
-        nodes.import_statistics(nodedb['nodes'], alfred.statistics())
 
     # acquire gwl and visdata for each batman instance
     mesh_info = []
@@ -112,6 +113,10 @@ def main(params):
         nodes.mark_vis_data_online(nodedb['nodes'], vd, now)
         nodes.mark_gateways(nodedb['nodes'], gwl)
 
+    # get alfred statistics
+    for alfred in alfred_instances:
+        nodes.import_statistics(nodedb['nodes'], alfred.statistics())
+
     # clear the nodedb from nodes that have not been online in $prune days
     if params['prune']:
         nodes.prune_nodes(nodedb['nodes'], now, params['prune'])
@@ -188,12 +193,12 @@ if __name__ == '__main__':
                         help='Assume MAC addresses are part of vpn')
     parser.add_argument('-p', '--prune', metavar='DAYS', type=int,
                         help='Forget nodes offline for at least DAYS')
-    parser.add_argument('--with-rrd', dest='rrd', action='store_true',
+    parser.add_argument('-r', '--with-rrd', dest='rrd', action='store_true',
                         default=False,
                         help='Enable the collection of RRD data')
-    parser.add_argument('--nodedb', metavar='RRD_DIR', action='store',
+    parser.add_argument('-n', '--nodedb', metavar='RRD_DIR', action='store',
                         help='Directory for node RRD data files')
-    parser.add_argument('--with-img', dest='img', action='store_true',
+    parser.add_argument('-i', '--with-img', dest='img', action='store_true',
                         default=False,
                         help='Enable the rendering of RRD graphs (cpu '
                              'intensive)')
diff --git a/lib/rrddb.py b/lib/rrddb.py
index f1678f5..a53e456 100644
--- a/lib/rrddb.py
+++ b/lib/rrddb.py
@@ -22,11 +22,6 @@ class RRD(object):
         self.currentTimeInt = (int(time.time()) / 60) * 60
         self.currentTime = str(self.currentTimeInt)
 
-        try:
-            os.stat(self.imagePath)
-        except OSError:
-            os.mkdir(self.imagePath)
-
     def update_database(self, nodes):
         online_nodes = dict(filter(
             lambda d: d[1]['flags']['online'], nodes.items()))
@@ -39,6 +34,12 @@ class RRD(object):
             rrd.update()
 
     def update_images(self):
+        # Create image path if it does not exist
+        try:
+            os.stat(self.imagePath)
+        except OSError:
+            os.mkdir(self.imagePath)
+
         self.globalDb.graph(os.path.join(self.imagePath, "globalGraph.png"),
                             self.displayTimeGlobal)