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

Merge branch '2.3.x' into devel

Browse source
This commit is contained in:
Martin Konecny 2013-04-03 17:59:04 -04:00
commit 61f8e64329
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
python_apps/api_clients/api_client.py
View file

@ -13,6 +13,7 @@ import urllib2
import logging
import json
import base64
import traceback
from configobj import ConfigObj
AIRTIME_VERSION = "2.3.1"
@ -86,7 +87,6 @@ class ApiRequest(object):
req = urllib2.Request(final_url, _post_data)
response = urllib2.urlopen(req).read()
except Exception, e:
import traceback
self.logger.error('Exception: %s', e)
self.logger.error("traceback: %s", traceback.format_exc())
raise
@ -368,9 +368,10 @@ class AirtimeApiClient(object):
def notify_liquidsoap_status(self, msg, stream_id, time):
logger = self.logger
try:
encoded_msg = urllib.quote(msg, '')
self.services.update_liquidsoap_status.req(msg=encoded_msg, stream_id=stream_id,
boot_time=time).retry(5)
post_data = {"msg": msg}
self.services.update_liquidsoap_status.req(post_data,
stream_id=stream_id,
boot_time=time).retry(5)
except Exception, e:
#TODO
logger.error("Exception: %s", e)