aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorffki-rz root user <root@freifunk.in-kiel.de>2014-08-23 22:51:28 +0200
committerffki-rz root user <root@freifunk.in-kiel.de>2014-08-23 22:51:28 +0200
commitc3cf5e4197dac6d469cd1e445b8d241d791c44f7 (patch)
tree122c83c0c2f45f3ede582ede2b4778a528e3ce7d
parentf0b8ad64e999f5d7a5d1a4373acbcde403a5fda8 (diff)
just commit current status
-rw-r--r--NodeRRD.py2
-rwxr-xr-xbat2nodes.py8
-rwxr-xr-xget-nodes.pl2
-rwxr-xr-xmkmap.sh2
-rw-r--r--[-rwxr-xr-x]rrd.py0
5 files changed, 3 insertions, 11 deletions
diff --git a/NodeRRD.py b/NodeRRD.py
index f53cad6..6fa32f3 100644
--- a/NodeRRD.py
+++ b/NodeRRD.py
@@ -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):
"""
diff --git a/bat2nodes.py b/bat2nodes.py
index 7119464..6047d95 100755
--- a/bat2nodes.py
+++ b/bat2nodes.py
@@ -64,14 +64,6 @@ if options['alfred']:
af = alfred()
db.import_aliases(af.aliases())
-if options['alfred']:
- af = alfred()
- db.import_aliases(af.aliases())
-
-if options['alfred']:
- af = alfred()
- db.import_aliases(af.aliases())
-
db.count_clients()
if options['obscure']:
diff --git a/get-nodes.pl b/get-nodes.pl
index 5f6dc39..0e8f2ed 100755
--- a/get-nodes.pl
+++ b/get-nodes.pl
@@ -47,7 +47,7 @@ sub handle_node {
$tmp = $tmp->{'*'};
debug(4, "tmp:", $tmp);
- next unless $tmp =~ m!{{Node\s*(\|.+?)}}!sm;
+ return unless $tmp =~ m!{{Node\s*(\|.+?)}}!sm;
$tmp = $1;
debug(5, "tmp:", $tmp);
diff --git a/mkmap.sh b/mkmap.sh
index e503a5e..22e0019 100755
--- a/mkmap.sh
+++ b/mkmap.sh
@@ -9,4 +9,4 @@ cd "$(dirname "$0")"/
#./ffhlwiki.py http://freifunk.metameute.de/wiki/Knoten > aliases_hl.json
#./ffhlwiki.py http://freifunk.metameute.de/wiki/Moelln:Knoten > aliases_moelln.json
-./bat2nodes.py -A -a aliases.json -a aliases_hl.json -a aliases_moelln.json -d $DEST
+./bat2nodes.py -A -a aliases.json -d $DEST
diff --git a/rrd.py b/rrd.py
index 5c3330d..5c3330d 100755..100644
--- a/rrd.py
+++ b/rrd.py