Merge pull request #31 from sargon/master

global rrd: Count online nodes instead of nodes in state
2014-09-23 09:16:51 +02:00 · 2014-09-23 09:16:51 +02:00 · 878267ca0e
parent b7a079d418 b570d8956f
commit 878267ca0e
1 changed files with 2 additions and 1 deletions
--- a/rrddb.py
+++ b/rrddb.py
@ -30,7 +30,8 @@ class rrd:
    nodes = db.get_nodes()
    clientCount = sum(map(lambda d: d.clientcount, nodes))

-    self.globalDb.update(len(nodes), clientCount)
+    curtime = time.time() - 60
+    self.globalDb.update(len(list(filter(lambda x: x.lastseen >= curtime, nodes))), clientCount)
    for node in nodes:
      rrd = NodeRRD(
        os.path.join(self.dbPath, str(node.id).replace(':', '') + '.rrd'),