CC-4732: Ask for admin username + password in Stream Settings page

- done

python_apps/pypo/listenerstat.py

@@ -31,7 +31,7 @@ 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_pass)s" % ip)
 
         header = {"Authorization":"Basic %s" % encoded}
         self.logger.debug(ip)
@@ -78,8 +78,6 @@ 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"
             if v["enable"] == 'true':
                 stats.append(self.get_icecast_stats(v))
             #stats.append(get_shoutcast_stats(ip))
@@ -103,8 +101,7 @@ class ListenerStat(Thread):
 
                 self.push_stream_stats(stats)
             except Exception, e:
-                top = traceback.format_exc()
-                self.logger.error('Exception: %s', top)
+                self.logger.error('Exception: %s', e)
 
             time.sleep(120)
 

python_apps/pypo/pypofetch.py

@@ -188,28 +188,6 @@ class PypoFetch(Thread):
             self.update_liquidsoap_station_name(info['station_name'])
             self.update_liquidsoap_transition_fade(info['transition_fade'])
 
-    def write_liquidsoap_config(self, setting):
-        fh = open('/etc/airtime/liquidsoap.cfg', 'w')
-        self.logger.info("Rewriting liquidsoap.cfg...")
-        fh.write("################################################\n")
-        fh.write("# THIS FILE IS AUTO GENERATED. DO NOT CHANGE!! #\n")
-        fh.write("################################################\n")
-        for k, d in setting:
-            buffer_str = d[u'keyname'] + " = "
-            if d[u'type'] == 'string':
-                temp = d[u'value']
-                buffer_str += '"%s"' % temp
-            else:
-                temp = d[u'value']
-                if temp == "":
-                    temp = "0"
-                buffer_str += temp
-
-            buffer_str += "\n"
-            fh.write(api_client.encode_to(buffer_str))
-        fh.write("log_file = \"/var/log/airtime/pypo-liquidsoap/<script>.log\"\n");
-        fh.close()
-
     def restart_liquidsoap(self):
 
         self.telnet_lock.acquire()