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

CC-5049: Error messages on Liquidsoap start up/shut down after Airtime install 

fixed
This commit is contained in:
Martin Konecny 2013-05-08 13:47:24 -04:00
parent 84a05d83f7
commit f0e846db75
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python_apps/pypo/airtime-liquidsoap
View File

@ -10,7 +10,11 @@ ls_param="/usr/lib/airtime/pypo/bin/liquidsoap_scripts/ls_script.liq"
export PYTHONPATH=${api_client_path} export PYTHONPATH=${api_client_path}
cd /usr/lib/airtime/pypo/bin/liquidsoap_scripts SCRIPT=`readlink -f $0`
# Absolute directory this script is in
SCRIPTPATH=`dirname $SCRIPT`
cd $SCRIPTPATH/liquidsoap_scripts
python generate_liquidsoap_cfg.py python generate_liquidsoap_cfg.py
exec ${ls_path} ${ls_param} 2>&1 exec ${ls_path} ${ls_param} 2>&1

24
python_apps/pypo/liquidsoap_scripts/generate_liquidsoap_cfg.py
View File

@ -1,5 +1,6 @@
import logging import logging
import sys import sys
import time
from api_clients.api_client import AirtimeApiClient from api_clients.api_client import AirtimeApiClient
def generate_liquidsoap_config(ss): def generate_liquidsoap_config(ss):
@ -26,10 +27,19 @@ def generate_liquidsoap_config(ss):
logging.basicConfig(format='%(message)s') logging.basicConfig(format='%(message)s')
ac = AirtimeApiClient(logging.getLogger()) ac = AirtimeApiClient(logging.getLogger())
try: attempts = 0
ss = ac.get_stream_setting() max_attempts = 5
generate_liquidsoap_config(ss)
except Exception, e: while True:
logging.error(str(e)) try:
print "Unable to connect to the Airtime server." ss = ac.get_stream_setting()
sys.exit(1) generate_liquidsoap_config(ss)
break
except Exception, e:
if attempts == max_attempts:
print "Unable to connect to the Airtime server."
logging.error(str(e))
sys.exit(1)
else:
time.sleep(3)
attempts += 1