Moved around the exception checking

This commit is contained in:
2011-01-19 13:31:49 +00:00
parent 089110d7ae
commit 165d2de903

View File

@@ -17,11 +17,9 @@ def import_corp_details(corp_id, callback=None, **kwargs):
except APIAccessException, exc: except APIAccessException, exc:
log.error('Error importing corporation - queueing for retry') log.error('Error importing corporation - queueing for retry')
import_corp_details.retry(args=[corp_id, callback], exc=exc, kwargs=kwargs) import_corp_details.retry(args=[corp_id, callback], exc=exc, kwargs=kwargs)
if callback:
subtask(callback).delay(corporation=corp.id)
else: else:
return corp if callback:
subtask(callback).delay(corporation=corp.id)
@task() @task()
@@ -31,12 +29,11 @@ def import_corp_details_result(corp_id, callback=None):
corp = import_corp_details_func(corp_id, log) corp = import_corp_details_func(corp_id, log)
except APIAccessException, exc: except APIAccessException, exc:
log.error('Error importing corporation') log.error('Error importing corporation')
return none
if callback:
subtask(callback).delay(corporation=corp.id)
else: else:
return corp if callback:
subtask(callback).delay(corporation=corp.id)
else:
return corp
def import_corp_details_func(corp_id, log=logging.getLogger(__name__)): def import_corp_details_func(corp_id, log=logging.getLogger(__name__)):