diff --git a/app/api/workers.py b/app/api/workers.py index 51a081ad..870ca87d 100644 --- a/app/api/workers.py +++ b/app/api/workers.py @@ -1,7 +1,7 @@ import os import mimetypes -from worker.celery import app as celery +from worker.tasks import TestSafeAsyncResult from rest_framework.views import APIView from rest_framework.response import Response from rest_framework import status, permissions @@ -14,7 +14,8 @@ class CheckTask(APIView): permission_classes = (permissions.AllowAny,) def get(self, request, celery_task_id=None, **kwargs): - res = celery.AsyncResult(celery_task_id) + res = TestSafeAsyncResult(celery_task_id) + if not res.ready(): return Response({'ready': False}, status=status.HTTP_200_OK) else: @@ -43,7 +44,7 @@ class GetTaskResult(APIView): permission_classes = (permissions.AllowAny,) def get(self, request, celery_task_id=None, **kwargs): - res = celery.AsyncResult(celery_task_id) + res = TestSafeAsyncResult(celery_task_id) if res.ready(): result = res.get() file = result.get('file', None) # File path diff --git a/app/static/app/js/components/LayersControlLayer.jsx b/app/static/app/js/components/LayersControlLayer.jsx index 85276bc2..ec610606 100644 --- a/app/static/app/js/components/LayersControlLayer.jsx +++ b/app/static/app/js/components/LayersControlLayer.jsx @@ -45,7 +45,6 @@ export default class LayersControlLayer extends React.Component { if (mUrl){ for (let d of mUrlToDownload){ const idx = mUrl.lastIndexOf(d.url); - console.log(mUrl); if (idx !== -1){ this.downloadFileUrl = mUrl.substr(0, idx) + "download/" + d.download; break; diff --git a/app/templates/app/logged_in_base.html b/app/templates/app/logged_in_base.html index 5611d808..6d64ecaa 100644 --- a/app/templates/app/logged_in_base.html +++ b/app/templates/app/logged_in_base.html @@ -4,190 +4,6 @@ {% block navbar-top-links %}