Commit graph

338 commits

Author SHA1 Message Date
Nils Schneider 474a374cd6 Merge pull request #37 from NoMoKeTo/patch-1
How about a less confusing repr?
2015-02-21 19:40:43 +01:00
Nils Martin Klünder 71c2417b9d How about a less confusing repr?
„WTF, why is this a string?”
2015-02-21 19:17:49 +01:00
Nils Schneider 45d920850e Merge pull request #36 from thisco-de/master
Fixes iteration over chars in maybe_node_by_mac() when processing neighbor entries
2015-02-01 14:25:54 +01:00
Stefan Laudemann b3c629264a Changes try-except-blocks around maybe_nody_by_*() calls to only catch KeyError exceptions.
Semantically, all the implemented error handling for the try-except-
blocks around calls to "maybe_node_by_mac()" or "maybe_node_by_id()" in
nodedb.py only handle the case that a particular MAC address cannot be
found in the list of known nodes. If such a MAC address cannot be found
in this list, the methods properly indicate this by raising a KeyError.
However, all the try-except-block generically catch all exceptions and
thus may cover other problems. But not only that problems might be
covered by this, generic try-except-blocks make finding errors and de-
bugging quite painful.
Hence, these try-except-blocks should only catch KeyErrors or at least
have an error handling that differs from other exceptions.
2015-02-01 13:50:01 +01:00
Stefan Laudemann 94f7256564 Adds missing comma to pass (x['neighbor'], ) as tuple (not as str).
As Python interprets "(elem)" as string and not as tuple,
maybe_node_by_mac() iterates over the single characters in the MAC-
addressed passed as parameter when called parse_vis_data(). Most of the
calls already use the "(elem, )" syntax to indicate that a tuple is
passed. However, there is still one call for which this is not the case
causing a noticable longer runtime due to calls to maybe_node_by_mac()
that cannot yield any useful result.
2015-02-01 13:47:07 +01:00
Nils Schneider ee8bbd8b3e simplify clientcount 2014-09-23 09:23:27 +02:00
Nils Schneider 6e101bc6de simplify mark_gateway 2014-09-23 09:23:27 +02:00
Nils Schneider 878267ca0e 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
Daniel Ehlers b570d8956f global rrd: Count online nodes instead of nodes in state 2014-09-22 23:34:21 +02:00
Nils Schneider b7a079d418 remove dead code 2014-09-20 21:37:00 +02:00
Nils Schneider 48a1744639 firstseen 2014-09-20 21:17:15 +02:00
Jan-Philipp Litza 65655a38bb RRD: Fix updating of DS 2014-08-17 21:01:50 +02:00
Nils Schneider 26e57117ff rename rrd.py to rrddb.py 2014-08-17 19:32:13 +02:00
Nils Schneider 3780fb6cb1 fix rrd.py for real 2014-08-17 19:31:14 +02:00
Nils Schneider a5cb5f0fdb remove fuzzy matching 2014-08-17 19:10:32 +02:00
Nils Schneider 0d71de7091 fix rrd 2014-08-17 19:10:19 +02:00
Nils Schneider 2dfd11189d count clients, instead of nodes 2014-08-17 18:53:09 +02:00
Nils Schneider 663539c206 Revert "remove fuzzy matching"
This reverts commit a88b207cf1.
2014-08-12 20:51:36 +02:00
Nils Schneider a88b207cf1 remove fuzzy matching 2014-08-10 09:36:29 +02:00
Nils Schneider 263dd4ceff alfred.py: use gzip (requires alfred-json v0.2) 2014-07-05 20:23:06 +02:00
Nils Schneider 9f546be0c7 persistent state (mostly for gluon nodes), prune after 30d 2014-06-29 22:47:29 +02:00
Nils Schneider 56b884b810 remove dead code 2014-06-29 11:20:56 +02:00
Nils Schneider 0ab4ce6e2b Merge pull request #28 from smoe/patch-1
Patch 1 - install instructions
2014-06-21 21:14:24 +02:00
Steffen Möller a53715b554 Syntax 2014-06-21 20:18:41 +02:00
Steffen Möller 6664c0d53e Explained execution of mkmap.sh and crontab
Also improved markdown formatting ... slightly.
2014-06-21 20:16:52 +02:00
Steffen Möller f4f619e52e Basic install instructions 2014-06-21 20:04:14 +02:00
Nils Schneider f18d0b38a9 bugs 2014-05-31 14:53:38 +02:00
Nils Schneider 26fc2a9aef alfred: use network.mac as ID if present 2014-05-02 10:49:32 +02:00
Nils Schneider b3a921347c Merge pull request #26 from T-X/for-upstream
try non-fuzzy prior fuzzy mac matching
2014-05-02 08:55:19 +02:00
Linus Lüssing 605765cd12 try non-fuzzy prior fuzzy mac matching
Fuzzy matching should only be tried if there's no exact match. Otherwise
a node in the map might get the wrong label.
2014-05-02 04:10:39 +02:00
Nils Schneider ac3366ff13 count clients and add clientcount attribute to each node 2014-04-10 17:17:11 +02:00
Nils Schneider fbc5c636df alfred.py: ignore non-parseable locations 2014-03-30 13:20:15 +02:00
Nils Schneider d6bd31f8d0 Merge pull request #20 from FreifunkBremen/RRD-module
RRD module
2014-02-21 15:06:04 +01:00
Jan-Philipp Litza ca2ab676b3 Modularize global and node rrd definitions and graphings 2014-02-16 16:54:10 +01:00
Jan-Philipp Litza 17fcf10b74 Offload rrdtool calls and model to separate module 2014-02-16 16:52:59 +01:00
Nils Schneider 791947234c rrd: do not define RRAs twice 2014-02-11 12:22:53 +01:00
Nils Schneider 7f49d93311 bat2nodes: deal with rrd after creating nodes.json 2014-02-11 11:36:05 +01:00
Nils Schneider 0918b5a3b1 rrd: fixes 2014-02-11 11:35:18 +01:00
Nils Schneider 2ad0deda40 rrd: saner RRAs for global 2014-02-11 11:23:06 +01:00
Nils Schneider 35f42dbcf1 rrd: saner RRAs 2014-02-11 11:19:53 +01:00
Nils Schneider 8c0e367f3d rrd.py: remove unused argument 2014-02-09 16:55:50 +01:00
Nils Schneider 37db42b51e mkmap.sh: enable alfred 2014-02-07 11:03:27 +01:00
Nils Schneider baa123c25e mkmap.sh: $GWS was not set 2014-02-07 11:03:02 +01:00
Nils Schneider 352d00e7a4 mkmap.sh: cd into directory instead of dirname everywhere 2014-02-07 10:53:22 +01:00
Nils Schneider ef9d762c93 Merge pull request #16 from sargon/optimize-nodedb-py
nodedb.py: stop similar mac address check when parts are not equal
2014-02-04 13:02:38 -08:00
Daniel Ehlers 613fa425ed nodedb.py: stop similar mac address check when parts are not equal 2014-02-04 15:54:04 +01:00
Nils Schneider 914836eb9a alfred.py: pass firmware version to nodes.json 2014-02-02 23:30:16 +01:00
Nils Schneider bd19e5f18c Merge pull request #15 from freifunkhamburg/obfuscation-fixes
Obfuscation fixes
2014-02-01 19:27:29 -08:00
Andreas Baldeau ddf7e4f8db Fixed variable name and catches only KeyErrors to not hide other errors. 2014-01-31 22:15:30 +01:00
Andreas Baldeau cd743ff46c Fixes client mac obfuscation. Node to node links stay untouched now. 2014-01-31 22:15:30 +01:00