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

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

This commit is contained in:
Rudi Grinberg 2012-08-30 16:50:21 -04:00
parent 3571e2c691 f9dca67376
commit 9318d069be
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
python_apps/api_clients/api_client.py
View File

@ -71,7 +71,7 @@ class AirtimeApiClient():
self.logger.error('Error loading config file: %s', e) self.logger.error('Error loading config file: %s', e)
sys.exit(1) sys.exit(1)
def get_response_from_server(self, url): def get_response_from_server(self, url, attempts=-1):
logger = self.logger logger = self.logger
successful_response = False successful_response = False
@ -93,6 +93,14 @@ class AirtimeApiClient():
else: else:
logger.debug(url) logger.debug(url)
#If the user passed in a positive attempts number then that means
#attempts will roll over 0 and we stop. If attempts was initially negative,
#then we have unlimited attempts
if attempts > 0:
attempts = attempts - 1
if attempts == 0:
successful_response = True
if not successful_response: if not successful_response:
logger.error("Error connecting to server, waiting 5 seconds and trying again.") logger.error("Error connecting to server, waiting 5 seconds and trying again.")
time.sleep(5) time.sleep(5)
@ -240,7 +248,7 @@ class AirtimeApiClient():
url = url.replace("%%api_key%%", self.config["api_key"]) url = url.replace("%%api_key%%", self.config["api_key"])
self.get_response_from_server(url) self.get_response_from_server(url, attempts=5)
except Exception, e: except Exception, e:
logger.error("Exception: %s", str(e)) logger.error("Exception: %s", str(e))
@ -259,7 +267,7 @@ class AirtimeApiClient():
logger.debug(url) logger.debug(url)
url = url.replace("%%api_key%%", self.config["api_key"]) url = url.replace("%%api_key%%", self.config["api_key"])
response = self.get_response_from_server(url) response = self.get_response_from_server(url, attempts = 5)
response = json.loads(response) response = json.loads(response)
logger.info("API-Status %s", response['status']) logger.info("API-Status %s", response['status'])
logger.info("API-Message %s", response['message']) logger.info("API-Message %s", response['message'])
@ -591,7 +599,7 @@ class AirtimeApiClient():
url = url.replace("%%stream_id%%", stream_id) url = url.replace("%%stream_id%%", stream_id)
url = url.replace("%%boot_time%%", time) url = url.replace("%%boot_time%%", time)
self.get_response_from_server(url) self.get_response_from_server(url, attempts = 5)
except Exception, e: except Exception, e:
logger.error("Exception: %s", e) logger.error("Exception: %s", e)
@ -604,7 +612,7 @@ class AirtimeApiClient():
url = url.replace("%%sourcename%%", sourcename) url = url.replace("%%sourcename%%", sourcename)
url = url.replace("%%status%%", status) url = url.replace("%%status%%", status)
self.get_response_from_server(url) self.get_response_from_server(url, attempts = 5)
except Exception, e: except Exception, e:
logger.error("Exception: %s", e) logger.error("Exception: %s", e)
@ -725,6 +733,6 @@ class AirtimeApiClient():
self.logger.debug(url) self.logger.debug(url)
request = urllib2.Request(url, data) request = urllib2.Request(url, data)
self.logger.info(self.get_response_from_server(request)) self.logger.info(self.get_response_from_server(request, attempts = 5))
except Exception, e: except Exception, e:
self.logger.error("Exception: %s", e) self.logger.error("Exception: %s", e)

3
python_apps/pypo/liquidsoap_scripts/notify.sh
View File

@ -10,4 +10,5 @@ SCRIPT=`readlink -f $0`
# Absolute path this script is in # Absolute path this script is in
SCRIPTPATH=`dirname $SCRIPT` SCRIPTPATH=`dirname $SCRIPT`
cd ${SCRIPTPATH}/../ && python pyponotify.py "$@" cd ${SCRIPTPATH}/../
timeout 45 python pyponotify.py "$@"