diff options
author | ffki-rz root user <root@freifunk.in-kiel.de> | 2014-08-23 22:51:28 +0200 |
---|---|---|
committer | ffki-rz root user <root@freifunk.in-kiel.de> | 2014-08-23 22:51:28 +0200 |
commit | c3cf5e4197dac6d469cd1e445b8d241d791c44f7 (patch) | |
tree | 122c83c0c2f45f3ede582ede2b4778a528e3ce7d | |
parent | f0b8ad64e999f5d7a5d1a4373acbcde403a5fda8 (diff) |
just commit current status
-rw-r--r-- | NodeRRD.py | 2 | ||||
-rwxr-xr-x | bat2nodes.py | 8 | ||||
-rwxr-xr-x | get-nodes.pl | 2 | ||||
-rwxr-xr-x | mkmap.sh | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | rrd.py | 0 |
5 files changed, 3 insertions, 11 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): """ 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); @@ -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 |