nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2026-01-30 07:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow for the call to define the timeout, set at a default of 30secs

Browse Source
This commit is contained in:
Andrew Williams
2011-06-15 12:07:08 +01:00
parent bdcb572645
commit edac3d83dc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/handlers/v1.py
View File

@@ -131,7 +131,7 @@ class OpTimerHandler(BaseHandler):
error_doc = {'ops': [{'startsIn': -1, 'eventID': 0, 'ownerName': '', 'eventDate': '', 'eventTitle': '<div style="text-align:center">The EVE API calendar is unavailable</div>', 'duration': 0, 'isImportant': 0, 'eventText': 'Fuck CCP tbqh imho srsly', 'endsIn':-1, 'forumLink': ''}]} error_doc = {'ops': [{'startsIn': -1, 'eventID': 0, 'ownerName': '', 'eventDate': '', 'eventTitle': '<div style="text-align:center">The EVE API calendar is unavailable</div>', 'duration': 0, 'isImportant': 0, 'eventText': 'Fuck CCP tbqh imho srsly', 'endsIn':-1, 'forumLink': ''}]}
try: try:
cached_doc = CachedDocument.objects.api_query('/char/UpcomingCalendarEvents.xml.aspx', params, service="Optimer") cached_doc = CachedDocument.objects.api_query('/char/UpcomingCalendarEvents.xml.aspx', params, timeout=10, service="Optimer")
except DocumentRetrievalError: except DocumentRetrievalError:
return error_doc return error_doc
dom = minidom.parseString(cached_doc.body.encode('utf-8')) dom = minidom.parseString(cached_doc.body.encode('utf-8'))

4
app/eve_proxy/models.py
View File

@@ -39,7 +39,7 @@ class CachedDocumentManager(models.Manager):
return url return url
def api_query(self, url_path, params={}, no_cache=False, exceptions=True, service="Auth"): def api_query(self, url_path, params={}, no_cache=False, exceptions=True, timeout=30, service="Auth"):
""" """
Transparently handles querying EVE API or retrieving the document from Transparently handles querying EVE API or retrieving the document from
the cache. the cache.
@@ -69,7 +69,7 @@ class CachedDocumentManager(models.Manager):
if sys.version_info < (2, 6): if sys.version_info < (2, 6):
conn = urllib2.urlopen(req) conn = urllib2.urlopen(req)
else: else:
conn = urllib2.urlopen(req, timeout=5) conn = urllib2.urlopen(req, timeout=timeout)
except urllib2.HTTPError, e: except urllib2.HTTPError, e:
print "HTTP Error Code: %s" % e.code print "HTTP Error Code: %s" % e.code
raise DocumentRetrievalError(e.code) raise DocumentRetrievalError(e.code)