diff --git a/eve_api/api_puller/accounts.py b/eve_api/api_puller/accounts.py index f285f6b..4ec9432 100755 --- a/eve_api/api_puller/accounts.py +++ b/eve_api/api_puller/accounts.py @@ -24,10 +24,7 @@ def import_eve_account(api_key, user_id, force_cache=False): """ auth_params = {'userid': user_id, 'apikey': api_key} - try: - account_doc = CachedDocument.objects.api_query('/account/Characters.xml.aspx', params=auth_params, no_cache=force_cache) - except: - return + account_doc = CachedDocument.objects.api_query('/account/Characters.xml.aspx', params=auth_params, no_cache=force_cache) if account_doc and account_doc.body: dom = minidom.parseString(account_doc.body.encode('utf-8')) diff --git a/eve_api/tasks.py b/eve_api/tasks.py index 8d0767f..72b94bf 100644 --- a/eve_api/tasks.py +++ b/eve_api/tasks.py @@ -29,7 +29,11 @@ def queue_apikey_updates(update_delay=86400, batch_size=50): @task() def import_apikey(api_userid, api_key, user=None, force_cache=False): + + log = import_apikey.get_logger('import_apikey') + log.info('Importing %s/%s' % (api_userid, api_key)) acc = import_eve_account(api_key, api_userid, force_cache=force_cache) + log.debug('Completed') donecorps = [] if acc and acc.api_status == API_STATUS_OK: if user and not acc.user: @@ -45,13 +49,10 @@ def import_apikey(api_userid, api_key, user=None, force_cache=False): donecorps.append(char.corporation.id) for char in acc.characters.all(): - try: - if char.corporation.id not in donecorps: - if char.corporation.api_last_updated < (datetime.datetime.now() - datetime.timedelta(hours=12)): - import_corp_details.delay(corp_id=char.corporation.id) - donecorps.append(char.corporation.id) - except: - continue + if char.corporation.id not in donecorps: + if char.corporation.api_last_updated < (datetime.datetime.now() - datetime.timedelta(hours=12)): + import_corp_details.delay(corp_id=char.corporation.id) + donecorps.append(char.corporation.id) acc.save() if acc.user: