nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-14 14:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added some better API error handling and cleanup.

Browse Source
This commit is contained in:
Andrew Williams
2011-02-01 16:51:56 +00:00
parent 9e839023e8
commit bf18d43301
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
eve_api/views.py
View File

@@ -10,6 +10,7 @@ from django.http import Http404
from django.core import serializers from django.core import serializers
from eve_proxy.models import ApiAccessLog from eve_proxy.models import ApiAccessLog
from eve_api.api_exceptions import DocumentRetrievalError
from eve_api.forms import EveAPIForm from eve_api.forms import EveAPIForm
from eve_api.models import EVEAccount, EVEPlayerCharacter, EVEPlayerCorporation from eve_api.models import EVEAccount, EVEPlayerCharacter, EVEPlayerCorporation
from eve_api.tasks import import_apikey_result from eve_api.tasks import import_apikey_result
@@ -29,6 +30,10 @@ def eveapi_add(request, post_save_redirect='/'):
except celery.exceptions.TimeoutError: except celery.exceptions.TimeoutError:
msg = "The addition of your API key is still processing, please check back in a minute or so." msg = "The addition of your API key is still processing, please check back in a minute or so."
pass pass
except DocumentRetrievalError:
msg = "An issue with the EVE API was encountered while adding your API, please try again later."
except:
msg = "An unknown error was encountered while trying to add your API key, please try again later."
else: else:
msg = "EVE API key %d successfully added." % form.cleaned_data['user_id'] msg = "EVE API key %d successfully added." % form.cleaned_data['user_id']
messages.success(request, msg, fail_silently=True) messages.success(request, msg, fail_silently=True)
@@ -68,7 +73,7 @@ def eveapi_refresh(request, userid, post_save_redirect='/'):
if request.is_ajax(): if request.is_ajax():
try: try:
acc = task.wait(30) acc = task.wait(30)
except celery.exceptions.TimeoutError: except (celery.exceptions.TimeoutError, DocumentRetrievalError):
acc = EVEAccount.objects.get(id=userid) acc = EVEAccount.objects.get(id=userid)
return HttpResponse(serializers.serialize('json', [acc]), mimetype='application/javascript') return HttpResponse(serializers.serialize('json', [acc]), mimetype='application/javascript')
else: else: