Browse Source

Remove celery.task.mark_as_read() and celery.task.mark_as_failure(), as they're not really publically useful.

Ask Solem 16 years ago
parent
commit
41d8f360e9
3 changed files with 5 additions and 24 deletions
  1. 0 20
      celery/task.py
  2. 2 1
      celery/tests/test_task.py
  3. 3 3
      celery/worker.py

+ 0 - 20
celery/task.py

@@ -70,26 +70,6 @@ def discard_all():
     return discarded_count
 
 
-def mark_as_done(task_id, result):
-    """Mark task as done (executed successfully).
-   
-    :param task_id: id of the task.
-    
-    :param result: the return value of the task.
-
-    """
-    default_backend.mark_as_done(task_id, result)
-
-
-def mark_as_failure(task_id, exc):
-    """Mark task as done (executed).
-    
-    :param task_id: id of the task.
-
-    :param exc: the exception instance raised by the task.
-
-    """
-    default_backend.mark_as_failure(task_id, exc)
 
 
 def is_done(task_id):

+ 2 - 1
celery/tests/test_task.py

@@ -7,6 +7,7 @@ from celery import task
 from celery import registry
 from celery.log import setup_logger
 from celery import messaging
+from celery.backends import default_backend
 
 
 # Task run functions can't be closures/lambdas, as they're pickled.
@@ -93,7 +94,7 @@ class TestCeleryTasks(unittest.TestCase):
 
         self.assertFalse(task.is_done(presult.task_id))
         self.assertFalse(presult.is_done())
-        task.mark_as_done(presult.task_id, result=None)
+        default_backend.mark_as_done(presult.task_id, result=None)
         self.assertTrue(task.is_done(presult.task_id))
         self.assertTrue(presult.is_done())
 

+ 3 - 3
celery/worker.py

@@ -7,7 +7,7 @@ from celery.log import setup_logger
 from celery.registry import tasks
 from celery.datastructures import TaskProcessQueue
 from celery.models import PeriodicTaskMeta
-from celery.task import mark_as_done, mark_as_failure
+from celery.backends import default_backend
 from celery.timer import EventTimer
 import multiprocessing
 import simplejson
@@ -38,10 +38,10 @@ def jail(task_id, callable_, args, kwargs):
     """
     try:
         result = callable_(*args, **kwargs)
-        mark_as_done(task_id, result)
+        default_backend.mark_as_done(task_id, result)
         return result
     except Exception, exc:
-        mark_as_failure(task_id, exc)
+        default_backend.mark_as_failure(task_id, exc)
         return exc