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

CC-4889: API client URL request is not wrapping in try/catch

Browse source 
-fixed
This commit is contained in:
drigato 2013-01-29 10:29:29 -05:00
parent 9d8a9faca8
commit db4e6bb94a
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
python_apps/api_clients/api_client.py
View file

@ -73,17 +73,26 @@ class ApcUrl(object):
else: return self.base_url else: return self.base_url
class ApiRequest(object): class ApiRequest(object):
def __init__(self, name, url): def __init__(self, name, url, logger=None):
self.name = name self.name = name
self.url = url self.url = url
self.__req = None self.__req = None
if logger is None: self.logger = logging
else: self.logger = logger
def __call__(self,_post_data=None, **kwargs): def __call__(self,_post_data=None, **kwargs):
# TODO : get rid of god damn urllib and replace everything with # TODO : get rid of god damn urllib and replace everything with
# grequests or requests at least # grequests or requests at least
final_url = self.url.params(**kwargs).url() final_url = self.url.params(**kwargs).url()
if _post_data is not None: _post_data = urllib.urlencode(_post_data) if _post_data is not None: _post_data = urllib.urlencode(_post_data)
req = urllib2.Request(final_url, _post_data) try:
response = urllib2.urlopen(req).read() req = urllib2.Request(final_url, _post_data)
response = urllib2.urlopen(req).read()
except Exception, e:
self.logger.error('Exception: %s', e)
import traceback
top = traceback.format_exc()
self.logger.error("traceback: %s", top)
response = ""
# Ghetto hack for now because we don't the content type we are getting # Ghetto hack for now because we don't the content type we are getting
# (Pointless to look at mime since it's not being set correctly always) # (Pointless to look at mime since it's not being set correctly always)
try: return json.loads(response) try: return json.loads(response)