From bb8f5e107c93c5f120148a3ef8393283d32c45a0 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Wed, 7 Nov 2012 17:19:47 -0500
Subject: [PATCH] CC-4661: Listener Statistics

-ability to gather stats without
admin password
---
 python_apps/pypo/listenerstat.py | 26 ++++++++++++--------------
 python_apps/pypo/pypocli.py      |  2 +-
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/python_apps/pypo/listenerstat.py b/python_apps/pypo/listenerstat.py
index 431f05e98..306015a58 100644
--- a/python_apps/pypo/listenerstat.py
+++ b/python_apps/pypo/listenerstat.py
@@ -10,8 +10,9 @@ import time
 from api_clients import api_client
 
 class ListenerStat(Thread):
-    def __init__(self, logger=None):
+    def __init__(self, config, logger=None):
         Thread.__init__(self)
+        self.config = config
         self.api_client = api_client.AirtimeApiClient()
         if logger is None:
             self.logger = logging.getLogger()
@@ -31,20 +32,18 @@ class ListenerStat(Thread):
 
 
     def get_icecast_xml(self, ip):
-        encoded = base64.b64encode("%(admin_user)s:%(admin_password)s" % ip)
+        #encoded = base64.b64encode("%(admin_user)s:%(admin_password)s" % ip)
 
-        header = {"Authorization":"Basic %s" % encoded}
+        #header = {"Authorization":"Basic %s" % encoded}
         self.logger.debug(ip)
-        url = 'http://%(host)s:%(port)s/admin/stats.xml' % ip
+        url = 'http://%(host)s:%(port)s/stats.xsl' % ip
         self.logger.debug(url)
-        req = urllib2.Request(
-            #assuming that the icecast stats path is /admin/stats.xml
-            #need to fix this
-            url=url,
-            headers=header)
+        req = urllib2.Request(url=url)
+            #headers=header)
 
         f = urllib2.urlopen(req)
         document = f.read()
+
         return document
 
 
@@ -78,11 +77,10 @@ class ListenerStat(Thread):
         #streams are the same server, we will still initiate 3 separate
         #connections
         for k, v in stream_parameters.items():
-            v["admin_user"] = "admin"
-            v["admin_password"] = "hackme"
+            #v["admin_user"] = "admin"
+            #v["admin_password"] = "hackme"
             if v["enable"] == 'true':
                 stats.append(self.get_icecast_stats(v))
-            #stats.append(get_shoutcast_stats(ip))
 
         return stats
 
@@ -123,5 +121,5 @@ if __name__ == "__main__":
     # add ch to logger
     #logger.addHandler(ch)
 
-    ls = ListenerStat(logger)
-    ls.run()
+    #ls = ListenerStat(logger=logger)
+    #ls.run()
diff --git a/python_apps/pypo/pypocli.py b/python_apps/pypo/pypocli.py
index 1b51a13f8..ac511c8e5 100644
--- a/python_apps/pypo/pypocli.py
+++ b/python_apps/pypo/pypocli.py
@@ -210,7 +210,7 @@ if __name__ == '__main__':
     recorder.daemon = True
     recorder.start()
 
-    stat = ListenerStat()
+    stat = ListenerStat(config)
     stat.daemon = True
     stat.start()