Remove GA

contrib/monitor/index.html

@@ -401,15 +401,5 @@
     <script src="https://code.highcharts.com/5.0.12/highcharts.js"></script>
     <script src="https://code.highcharts.com/5.0.12/modules/drilldown.js"></script>
     <script src="./js/eddn.js"></script>
-
-    <script>
-      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-      ga('create', 'UA-496332-23', 'auto');
-      ga('send', 'pageview');
-    </script>
 </body>
 </html>

contrib/monitor/schemas.html

@@ -283,15 +283,5 @@
         });
     });
     </script>
-    
-    <script>
-      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-    
-      ga('create', 'UA-496332-23', 'auto');
-      ga('send', 'pageview');
-    </script>
 </body>
 </html>

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)

src/eddn/core/Analytics.py

@@ -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