Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
denise 2013-01-18 16:40:44 -05:00
parent b818f1d46e e751b1203a
commit 55dcd5a784
2 changed files with 9 additions and 2 deletions
install_minimal/upgrades/airtime-2.3.0/data
upgrade.sql
python_apps/pypo
listenerstat.py

7
install_minimal/upgrades/airtime-2.3.0/data/upgrade.sql
View File

@ -4,6 +4,13 @@ INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.3.0');
INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('off_air_meta', 'Airtime - offline', 'string');
INSERT INTO cc_pref("keystr", "valstr") VALUES('enable_replay_gain', 1);
INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s1_admin_user', '', 'string');
INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s1_admin_pass', '', 'string');
INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s2_admin_user', '', 'string');
INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s2_admin_pass', '', 'string');
INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s3_admin_user', '', 'string');
INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s3_admin_pass', '', 'string');
--Make sure that cc_music_dir has a trailing '/' and cc_files does not have a leading '/'
UPDATE cc_music_dir SET directory = directory || '/' where id in (select id from cc_music_dirs where substr(directory, length(directory)) != '/');
UPDATE cc_files SET filepath = substring(filepath from 2) where id in (select id from cc_files where substring(filepath from 1 for 1) = '/')

4
python_apps/pypo/listenerstat.py
View File

@ -109,7 +109,7 @@ class ListenerStat(Thread):
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}
@ -126,7 +126,7 @@ class ListenerStat(Thread):
stats = self.get_stream_stats(stream_parameters["stream_params"])
self.logger.debug(stats)
if not stats:
self.logger.error("Not able to get listener stats")
else: