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

replace deprecated urllib with urllib2, and automatic reconnection attempts

This commit is contained in:
Martin Konecny 2012-04-27 16:05:26 -04:00
parent 0e32b5586f
commit 41aeec8a21
1 changed files with 30 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
python_apps/api_clients/api_client.py
View File

@ -30,10 +30,9 @@ def api_client_factory(config, logger=None):
temp_logger = logger temp_logger = logger
else: else:
temp_logger = logging.getLogger() temp_logger = logging.getLogger()
if config["api_client"] == "airtime": if config["api_client"] == "airtime":
return AirTimeApiClient(temp_logger) return AirTimeApiClient(temp_logger)
elif config["api_client"] == "obp":
return ObpApiClient()
else: else:
temp_logger.info('API Client "'+config["api_client"]+'" not supported. Please check your config file.\n') temp_logger.info('API Client "'+config["api_client"]+'" not supported. Please check your config file.\n')
sys.exit() sys.exit()
@ -175,18 +174,19 @@ class AirTimeApiClient(ApiClientInterface):
while not successful_response: while not successful_response:
try: try:
response = urllib.urlopen(url) response = urllib2.urlopen(url).read()
data = response.read()
successful_response = True successful_response = True
except IOError, e: except IOError, e:
logger.error('Error Authenticating with remote server: %s', e) logger.error('Error Authenticating with remote server: %s', e)
except Exception, e: except Exception, e:
logger.error('Couldn\'t connect to remote server. Is it running?') logger.error('Couldn\'t connect to remote server. Is it running?')
logger.error("%s" % e) logger.error("%s" % e)
if not successful_response: if not successful_response:
logger.error("Error connecting to server, waiting 5 seconds and trying again.")
time.sleep(5) time.sleep(5)
return data return response
def __get_airtime_version(self, verbose = True): def __get_airtime_version(self, verbose = True):
@ -293,8 +293,9 @@ class AirTimeApiClient(ApiClientInterface):
url = url.replace("%%schedule_id%%", str(schedule_id)) url = url.replace("%%schedule_id%%", str(schedule_id))
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 = urllib.urlopen(url)
response = json.loads(response.read()) response = self.get_response_from_server(url)
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'])
@ -376,8 +377,7 @@ class AirTimeApiClient(ApiClientInterface):
url = url.replace("%%djtype%%", dj_type) url = url.replace("%%djtype%%", dj_type)
url = url.replace("%%password%%", password) url = url.replace("%%password%%", password)
req = urllib2.Request(url) response = self.get_response_from_server(url)
response = urllib2.urlopen(req).read()
response = json.loads(response) response = json.loads(response)
except Exception, e: except Exception, e:
import traceback import traceback
@ -434,8 +434,7 @@ class AirTimeApiClient(ApiClientInterface):
url = url.replace("%%showinstanceid%%", str(md['MDATA_KEY_TRACKNUMBER'])) url = url.replace("%%showinstanceid%%", str(md['MDATA_KEY_TRACKNUMBER']))
url = url.replace("%%api_key%%", self.config["api_key"]) url = url.replace("%%api_key%%", self.config["api_key"])
req = urllib2.Request(url) response = self.get_response_from_server(url)
response = urllib2.urlopen(req).read()
response = json.loads(response) response = json.loads(response)
logger.info("associate recorded %s", response) logger.info("associate recorded %s", response)
@ -460,9 +459,8 @@ class AirTimeApiClient(ApiClientInterface):
url = url.replace("%%api_key%%", self.config["api_key"]) url = url.replace("%%api_key%%", self.config["api_key"])
url = url.replace("%%dir_id%%", dir_id) url = url.replace("%%dir_id%%", dir_id)
req = urllib2.Request(url) response = self.get_response_from_server(url)
response = urllib2.urlopen(req).read()
response = json.loads(response) response = json.loads(response)
except Exception, e: except Exception, e:
response = None response = None
@ -476,9 +474,8 @@ class AirTimeApiClient(ApiClientInterface):
url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["list_all_watched_dirs"]) url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["list_all_watched_dirs"])
url = url.replace("%%api_key%%", self.config["api_key"]) url = url.replace("%%api_key%%", self.config["api_key"])
req = urllib2.Request(url) response = self.get_response_from_server(url)
response = urllib2.urlopen(req).read()
response = json.loads(response) response = json.loads(response)
except Exception, e: except Exception, e:
response = None response = None
@ -493,9 +490,8 @@ class AirTimeApiClient(ApiClientInterface):
url = url.replace("%%api_key%%", self.config["api_key"]) url = url.replace("%%api_key%%", self.config["api_key"])
url = url.replace("%%path%%", base64.b64encode(path)) url = url.replace("%%path%%", base64.b64encode(path))
req = urllib2.Request(url) response = self.get_response_from_server(url)
response = urllib2.urlopen(req).read()
response = json.loads(response) response = json.loads(response)
except Exception, e: except Exception, e:
response = None response = None
@ -510,9 +506,8 @@ class AirTimeApiClient(ApiClientInterface):
url = url.replace("%%api_key%%", self.config["api_key"]) url = url.replace("%%api_key%%", self.config["api_key"])
url = url.replace("%%path%%", base64.b64encode(path)) url = url.replace("%%path%%", base64.b64encode(path))
req = urllib2.Request(url) response = self.get_response_from_server(url)
response = urllib2.urlopen(req).read()
response = json.loads(response) response = json.loads(response)
except Exception, e: except Exception, e:
response = None response = None
@ -528,8 +523,7 @@ class AirTimeApiClient(ApiClientInterface):
url = url.replace("%%api_key%%", self.config["api_key"]) url = url.replace("%%api_key%%", self.config["api_key"])
url = url.replace("%%path%%", base64.b64encode(path)) url = url.replace("%%path%%", base64.b64encode(path))
req = urllib2.Request(url) response = self.get_response_from_server(url)
response = urllib2.urlopen(req).read()
response = json.loads(response) response = json.loads(response)
except Exception, e: except Exception, e:
response = None response = None
@ -542,9 +536,8 @@ class AirTimeApiClient(ApiClientInterface):
try: try:
url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["get_stream_setting"]) url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["get_stream_setting"])
url = url.replace("%%api_key%%", self.config["api_key"]) url = url.replace("%%api_key%%", self.config["api_key"])
req = urllib2.Request(url) response = self.get_response_from_server(url)
response = urllib2.urlopen(req).read()
response = json.loads(response) response = json.loads(response)
except Exception, e: except Exception, e:
response = None response = None
@ -565,8 +558,7 @@ class AirTimeApiClient(ApiClientInterface):
url = url.replace("%%api_key%%", self.config["api_key"]) url = url.replace("%%api_key%%", self.config["api_key"])
url = url.replace("%%component%%", component) url = url.replace("%%component%%", component)
req = urllib2.Request(url) get_response_from_server(url)
response = urllib2.urlopen(req).read()
except Exception, e: except Exception, e:
logger.error("Exception: %s", e) logger.error("Exception: %s", e)
@ -582,8 +574,7 @@ class AirTimeApiClient(ApiClientInterface):
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)
req = urllib2.Request(url) response = self.get_response_from_server(url)
response = urllib2.urlopen(req).read()
except Exception, e: except Exception, e:
logger.error("Exception: %s", e) logger.error("Exception: %s", e)
@ -596,8 +587,7 @@ class AirTimeApiClient(ApiClientInterface):
url = url.replace("%%sourcename%%", sourcename) url = url.replace("%%sourcename%%", sourcename)
url = url.replace("%%status%%", status) url = url.replace("%%status%%", status)
req = urllib2.Request(url) response = self.get_response_from_server(url)
response = urllib2.urlopen(req).read()
except Exception, e: except Exception, e:
logger.error("Exception: %s", e) logger.error("Exception: %s", e)
@ -620,7 +610,8 @@ class AirTimeApiClient(ApiClientInterface):
req = urllib2.Request(url, data) req = urllib2.Request(url, data)
response = urllib2.urlopen(req).read() response = urllib2.urlopen(req).read()
logger.info("update file system mount: %s", response)
logger.info("update file system mount: %s", json.loads(response))
except Exception, e: except Exception, e:
import traceback import traceback
top = traceback.format_exc() top = traceback.format_exc()
@ -639,9 +630,8 @@ class AirTimeApiClient(ApiClientInterface):
url = url.replace("%%api_key%%", self.config["api_key"]) url = url.replace("%%api_key%%", self.config["api_key"])
url = url.replace("%%dir%%", base64.b64encode(dir)) url = url.replace("%%dir%%", base64.b64encode(dir))
req = urllib2.Request(url) response = self.get_response_from_server(url)
response = urllib2.urlopen(req).read() logger.info("update file system mount: %s", json.loads(response))
logger.info("update file system mount: %s", response)
except Exception, e: except Exception, e:
import traceback import traceback
top = traceback.format_exc() top = traceback.format_exc()
@ -658,10 +648,8 @@ class AirTimeApiClient(ApiClientInterface):
url = url.replace("%%api_key%%", self.config["api_key"]) url = url.replace("%%api_key%%", self.config["api_key"])
req = urllib2.Request(url) response = self.get_response_from_server(url)
response = urllib2.urlopen(req).read() logger.info("Bootstrap info retrieved %s", json.loads(response))
response = json.loads(response)
logger.info("Bootstrap info retrieved %s", response)
except Exception, e: except Exception, e:
response = None response = None
import traceback import traceback