From cab224c22496cd0ca1ab46b22cc36e99dd461cec Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Wed, 1 Dec 2010 09:29:00 +0000 Subject: [PATCH] Remove returning results from import_eveapi, as this is causing excess stored results on RabbitMQ --- eve_api/tasks.py | 4 +--- sso/views.py | 7 ++++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/eve_api/tasks.py b/eve_api/tasks.py index cbb1695..3a2cf0c 100644 --- a/eve_api/tasks.py +++ b/eve_api/tasks.py @@ -28,7 +28,7 @@ def queue_apikey_updates(update_delay=86400, batch_size=50): import_apikey.delay(api_key=acc.api_key, api_userid=acc.api_user_id) -@task() +@task(ignore_result=True) def import_apikey(api_userid, api_key, user=None, force_cache=False): log = import_apikey.get_logger('import_apikey') @@ -59,8 +59,6 @@ def import_apikey(api_userid, api_key, user=None, force_cache=False): if acc.user: update_user_access.delay(user=acc.user.id) - return acc - @task(ignore_result=True) def import_alliance_details(): diff --git a/sso/views.py b/sso/views.py index 7008a7c..eab2c92 100644 --- a/sso/views.py +++ b/sso/views.py @@ -108,10 +108,11 @@ def eveapi_refresh(request, userid=0): if request.is_ajax(): try: - acc = task.wait(30) - return HttpResponse(serializers.serialize('json', [acc]), mimetype='application/javascript') + task.wait(30) except celery.exceptions.TimeoutError: - return HttpResponse(serializers.serialize('json', []), mimetype='application/javascript') + pass + acc = EVEAccount.objects.get(id=userid) + return HttpResponse(serializers.serialize('json', [acc]), mimetype='application/javascript') else: messages.add_message(request, messages.INFO,"Key %s has been queued to be refreshed from the API" % acc.api_user_id)