From f3a51f3b95e3ce54bb5a52f81642fb9ec1510f46 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Sat, 3 Sep 2011 22:45:49 +0100 Subject: [PATCH] Make timeout setting definable, stop avoidable stack traces --- app/eve_api/tasks/character.py | 2 +- app/eve_proxy/models.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/eve_api/tasks/character.py b/app/eve_api/tasks/character.py index 25b3032..f600dfc 100644 --- a/app/eve_api/tasks/character.py +++ b/app/eve_api/tasks/character.py @@ -122,7 +122,7 @@ def import_eve_character_func(character_id, key_id=None, logger=logging.getLogge if gargoyle.is_active('eve-cak') and acc.is_cak: if not acc.has_access(3): logger.error('Key %s does not have access to CharacterSheet' % acc.pk) - raise APIAccessException + return auth_params = {'keyid': acc.api_user_id, 'vcode': acc.api_key, 'characterid': character_id } else: auth_params = {'userID': acc.api_user_id, 'apiKey': acc.api_key, 'characterID': character_id } diff --git a/app/eve_proxy/models.py b/app/eve_proxy/models.py index d85e730..463f0a3 100644 --- a/app/eve_proxy/models.py +++ b/app/eve_proxy/models.py @@ -39,7 +39,7 @@ class CachedDocumentManager(models.Manager): return url - def api_query(self, url_path, params={}, no_cache=False, exceptions=True, timeout=30, service="Auth"): + def api_query(self, url_path, params={}, no_cache=False, exceptions=True, timeout=settings.get('EVE_PROXY_TIMEOUT', 60), service="Auth"): """ Transparently handles querying EVE API or retrieving the document from the cache. @@ -57,7 +57,7 @@ class CachedDocumentManager(models.Manager): url = self.construct_url(url_path, params) doc_key = sha1(url).hexdigest() - print url + logger.debug('Requesting URL: %s' 5 url) try: doc = super(CachedDocumentManager, self).get_query_set().get(pk=doc_key)