diff --git a/contrib/monitor/index.html b/contrib/monitor/index.html index 34421fc..990386f 100644 --- a/contrib/monitor/index.html +++ b/contrib/monitor/index.html @@ -401,15 +401,5 @@ - - diff --git a/contrib/monitor/schemas.html b/contrib/monitor/schemas.html index 40d8790..34ac82b 100644 --- a/contrib/monitor/schemas.html +++ b/contrib/monitor/schemas.html @@ -283,15 +283,5 @@ }); }); - - diff --git a/src/eddn/Monitor.py b/src/eddn/Monitor.py index 57c9a9b..0d9cc3d 100644 --- a/src/eddn/Monitor.py +++ b/src/eddn/Monitor.py @@ -15,7 +15,6 @@ import re from bottle import get, request, response, run as bottle_run from eddn.conf.Settings import Settings, loadConfig -from eddn.core.Analytics import Analytics from gevent import monkey monkey.patch_all() @@ -152,8 +151,6 @@ class Monitor(Thread): receiver = context.socket(zmq.SUB) receiver.setsockopt(zmq.SUBSCRIBE, '') - analytics = Analytics() - for binding in Settings.MONITOR_RECEIVER_BINDINGS: receiver.connect(binding) @@ -192,7 +189,6 @@ class Monitor(Thread): db.commit() db.close() - analytics.hit('DUPLICATE', uploaderID, uploaderIP) return @@ -210,11 +206,6 @@ class Monitor(Thread): db.close() - if re.search('test', schemaID, re.I): - analytics.hit(Settings.GATEWAY_JSON_SCHEMAS[schemaID] + '#test', uploaderID, uploaderIP) - else: - analytics.hit(Settings.GATEWAY_JSON_SCHEMAS[schemaID], uploaderID, uploaderIP) - while True: inboundMessage = receiver.recv() gevent.spawn(monitor_worker, inboundMessage) diff --git a/src/eddn/core/Analytics.py b/src/eddn/core/Analytics.py deleted file mode 100644 index 5c510f0..0000000 --- a/src/eddn/core/Analytics.py +++ /dev/null @@ -1,33 +0,0 @@ -# coding: utf8 -import requests - -from hashlib import sha1 -from random import randint - -from traceback import print_exc -from eddn.conf.Settings import Settings - -class Analytics(object): - mobileProperty = 'MO' + Settings.MONITOR_UA[2:] - utmUrl = 'http://www.google-analytics.com/__utm.gif' - - def hit(self, schema, uploaderId, uploaderIp): - try: - if(uploaderId): - uploaderId = str(int("0x%s" % sha1(uploaderId).hexdigest(), 0))[:10] - else: - uploaderId = 'DUPLICATE' - - payload = {} - payload['utmwv'] = "5.2.2d", - payload['utmn'] = str(randint(1, 9999999999)), - payload['utmp'] = schema, - payload['utmac'] = self.mobileProperty - payload['utmcc'] = "__utma=%s;" % ".".join(["1", uploaderId, "1", "1", "1", "1"]) - payload['utmip'] = uploaderIp - - r = requests.get(self.utmUrl, params=payload) - except: - print_exc() - - return \ No newline at end of file