Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.3.x' into 2.3.x-saas

This commit is contained in:
Martin Konecny 2013-04-05 13:57:46 -04:00
parent 7727b72e68 cdb53048c7
commit 1a389a3765
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python_apps/pypo/listenerstat.py
View File

@ -58,7 +58,7 @@ class ListenerStat(Thread):
dom = xml.dom.minidom.parseString(document) dom = xml.dom.minidom.parseString(document)
sources = dom.getElementsByTagName("source") sources = dom.getElementsByTagName("source")
mount_stats = {} mount_stats = None
for s in sources: for s in sources:
#drop the leading '/' character #drop the leading '/' character
mount_name = s.getAttribute("mount")[1:] mount_name = s.getAttribute("mount")[1:]
@ -104,7 +104,8 @@ class ListenerStat(Thread):
if v["enable"] == 'true': if v["enable"] == 'true':
try: try:
if v["output"] == "icecast": if v["output"] == "icecast":
stats.append(self.get_icecast_stats(v)) mount_stats = self.get_icecast_stats(v)
if mount_stats: stats.append(mount_stats)
else: else:
stats.append(self.get_shoutcast_stats(v)) stats.append(self.get_shoutcast_stats(v))
self.update_listener_stat_error(v["mount"], 'OK') self.update_listener_stat_error(v["mount"], 'OK')