From bde962ade185a5033df0cf912f45e0ad1697058f Mon Sep 17 00:00:00 2001 From: AnthorNet Date: Thu, 7 May 2015 19:33:45 +0200 Subject: [PATCH] Fix monitor not removing topic from message --- src/eddn/Monitor.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/eddn/Monitor.py b/src/eddn/Monitor.py index 49a2f63..cbf40d1 100644 --- a/src/eddn/Monitor.py +++ b/src/eddn/Monitor.py @@ -20,16 +20,6 @@ def date(__format): return d.strftime(__format) -@get('/getGateways/') -def getGateways(): - response.set_header("Access-Control-Allow-Origin", "*") - gateways = [] - - for gateway in Settings.RELAY_RECEIVER_BINDINGS: - gateways.append(gateway) - - return simplejson.dumps(gateways) - @get('/getTotalSoftwares/') def getTotalSoftwares(): response.set_header("Access-Control-Allow-Origin", "*") @@ -185,6 +175,15 @@ class Monitor(Thread): def monitor_worker(message): db = sqlite3.connect(Settings.MONITOR_DB) + # Separate topic from message + message = message.split(' |-| ') + + # Handle gateway not sending topic + if len(message) > 1: + message = message[1] + else: + message = message[0] + if Settings.MONITOR_DECOMPRESS_MESSAGES: message = zlib.decompress(message) @@ -202,10 +201,11 @@ class Monitor(Thread): # Update uploader count uploaderID = json['header']['uploaderID'] - c = db.cursor() - c.execute('UPDATE uploaders SET hits = hits + 1 WHERE `name` = ? AND `dateStats` = DATE("now", "utc")', (uploaderID, )) - c.execute('INSERT OR IGNORE INTO uploaders (name, dateStats) VALUES (?, DATE("now", "utc"))', (uploaderID, )) - db.commit() + if uploaderID: # Don't get empty uploaderID + c = db.cursor() + c.execute('UPDATE uploaders SET hits = hits + 1 WHERE `name` = ? AND `dateStats` = DATE("now", "utc")', (uploaderID, )) + c.execute('INSERT OR IGNORE INTO uploaders (name, dateStats) VALUES (?, DATE("now", "utc"))', (uploaderID, )) + db.commit() # Update schemas count