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

CC-4796: Listener Stat: Authentication exception happens but no warning message on UI

Browse source 
- done
This commit is contained in:
James 2013-01-08 17:32:27 -05:00
parent 6d48e1faf0
commit 1263c04621
8 changed files with 62 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python_apps/api_clients/api_client.cfg
View file

@ -124,3 +124,5 @@ notify_liquidsoap_started = 'rabbitmq-do-push/api_key/%%api_key%%/format/json'
get_stream_parameters = 'get-stream-parameters/api_key/%%api_key%%/format/json'
push_stream_stats = 'push-stream-stats/api_key/%%api_key%%/format/json'
update_stream_setting_table = 'update-stream-setting-table/api_key/%%api_key%%/format/json'

4
python_apps/api_clients/api_client.py
View file

@ -383,3 +383,7 @@ class AirtimeApiClient(object):
# TODO : users of this method should do their own error handling
response = self.services.push_stream_stats(_post_data={'data': json.dumps(data)})
return response
def update_stream_setting_table(self, data):
response = self.services.update_stream_setting_table(_post_data={'data': json.dumps(data)})
return response

25
python_apps/pypo/listenerstat.py
View file

@ -95,15 +95,25 @@ class ListenerStat(Thread):
#connections
for k, v in stream_parameters.items():
if v["enable"] == 'true':
if v["output"] == "icecast":
stats.append(self.get_icecast_stats(v))
else:
stats.append(self.get_shoutcast_stats(v))
try:
if v["output"] == "icecast":
stats.append(self.get_icecast_stats(v))
else:
stats.append(self.get_shoutcast_stats(v))
self.update_listener_stat_error(v["mount"], 'OK')
except Exception, e:
self.logger.error('Exception: %s', e)
self.update_listener_stat_error(v["mount"], str(e))
return stats
def push_stream_stats(self, stats):
self.api_client.push_stream_stats(stats)
def update_listener_stat_error(self, stream_id, error):
keyname = '%s_listener_stat_error' % stream_id
data = {keyname: error}
self.api_client.update_stream_setting_table(data)
def run(self):
#Wake up every 120 seconds and gather icecast statistics. Note that we
@ -116,8 +126,11 @@ class ListenerStat(Thread):
stats = self.get_stream_stats(stream_parameters["stream_params"])
self.logger.debug(stats)
self.push_stream_stats(stats)
if not stats:
self.logger.error("Not able to get listener stats")
else:
self.push_stream_stats(stats)
except Exception, e:
self.logger.error('Exception: %s', e)