diff options
author | Nils Schneider <nils@nilsschneider.net> | 2014-08-17 19:10:19 +0200 |
---|---|---|
committer | Nils Schneider <nils@nilsschneider.net> | 2014-08-17 19:10:19 +0200 |
commit | 0d71de7091711ec4838c797c17c65b23454078c3 (patch) | |
tree | 9043c264f3a98446a8952713cb57a2d6201ae394 | |
parent | 2dfd11189dd419ab09cb0630accab78b37edefde (diff) |
fix rrd
-rw-r--r-- | NodeRRD.py | 2 | ||||
-rwxr-xr-x | batman.py | 2 | ||||
-rw-r--r-- | nodedb.py | 4 | ||||
-rwxr-xr-x | rrd.py | 18 |
4 files changed, 2 insertions, 24 deletions
@@ -30,7 +30,7 @@ class NodeRRD(RRD): return os.path.basename(self.filename).rsplit('.', 2)[0] + ".png" def update(self): - super().update({'upstate': 1, 'clients': self.node.clients}) + super().update({'upstate': 1, 'clients': self.node.clientcount}) def graph(self, directory, timeframe): """ @@ -31,8 +31,6 @@ class batman: output = subprocess.check_output(["batctl","-m",self.mesh_interface,"vd","json","-n"]) lines = output.splitlines() vds = self.vis_data_helper(lines) - for vd in vds: - vd['legacy'] = True return vds def vis_data_batadv_vis(self): @@ -91,8 +91,6 @@ class NodeDB: node = Node() node.lastseen = self.time node.flags['online'] = True - if 'legacy' in x: - node.flags['legacy'] = True self._nodes.append(node) node.add_mac(x['of']) @@ -110,8 +108,6 @@ class NodeDB: node = Node() node.lastseen = self.time node.flags['online'] = True - if 'legacy' in x: - node.flags['legacy'] = True node.add_mac(x['router']) self._nodes.append(node) @@ -28,23 +28,7 @@ class rrd: def update_database(self,db): nodes = {} - clientCount = 0 - for node in db.get_nodes(): - if node.flags['online']: - if not node.flags['client']: - nodes[node.id] = node - node.clients = 0; - if 'legacy' in node.flags and node.flags['legacy']: - clientCount -= 1 - else: - clientCount += 1 - for link in db.get_links(): - source = link.source.interface - target = link.target.interface - if source in nodes and not target in nodes: - nodes[source].clients += 1 - elif target in nodes and not source in nodes: - nodes[target].clients += 1 + clientCount = sum(map(lambda d: d.clientcount, db.get_nodes())) self.globalDb.update(len(nodes), clientCount) for node in nodes.values(): |