Markos Gogoulos há 2 anos atrás
pai
commit
dd7c0f461b
2 ficheiros alterados com 8 adições e 6 exclusões
  1. 6 4
      files/tasks.py
  2. 2 2
      files/views.py

+ 6 - 4
files/tasks.py

@@ -10,7 +10,8 @@ from celery import Task
 from celery.decorators import task
 from celery.exceptions import SoftTimeLimitExceeded
 from celery.signals import task_revoked
-from celery.task.control import revoke
+
+# from celery.task.control import revoke
 from celery.utils.log import get_task_logger
 from django.conf import settings
 from django.core.cache import cache
@@ -460,10 +461,11 @@ def check_running_states():
         if (now - encoding.update_date).seconds > settings.RUNNING_STATE_STALE:
             media = encoding.media
             profile = encoding.profile
-            task_id = encoding.task_id
+            # task_id = encoding.task_id
             # terminate task
-            if task_id:
-                revoke(task_id, terminate=True)
+            # TODO: not imported
+            # if task_id:
+            #    revoke(task_id, terminate=True)
             encoding.delete()
             media.encode(profiles=[profile])
             # TODO: allign with new code + chunksize...

+ 2 - 2
files/views.py

@@ -1,6 +1,5 @@
 from datetime import datetime, timedelta
 
-from celery.task.control import revoke
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
@@ -1396,5 +1395,6 @@ class TaskDetail(APIView):
     permission_classes = (permissions.IsAdminUser,)
 
     def delete(self, request, uid, format=None):
-        revoke(uid, terminate=True)
+        # This is not imported!
+        # revoke(uid, terminate=True)
         return Response(status=status.HTTP_204_NO_CONTENT)