Browse Source

Cosmetic changes

Ask Solem 15 years ago
parent
commit
30722fe8d5
2 changed files with 3 additions and 3 deletions
  1. 2 1
      celery/worker/controllers.py
  2. 1 2
      celery/worker/job.py

+ 2 - 1
celery/worker/controllers.py

@@ -84,6 +84,7 @@ class Mediator(BackgroundThread):
         self.callback = callback
 
     def on_iteration(self):
+        """Get tasks from bucket queue and apply the task callback."""
         logger = get_default_logger()
         try:
             logger.debug("Mediator: Trying to get message from bucket_queue")
@@ -91,7 +92,6 @@ class Mediator(BackgroundThread):
             task = self.bucket_queue.get(timeout=1)
         except QueueEmpty:
             logger.debug("Mediator: Bucket queue is empty.")
-            pass
         else:
             logger.debug("Mediator: Running callback for task: %s[%s]" % (
                 task.task_name, task.task_id))
@@ -119,6 +119,7 @@ class PeriodicWorkController(BackgroundThread):
         default_periodic_status_backend.init_periodic_tasks()
 
     def on_iteration(self):
+        """Run periodic tasks and process the hold queue."""
         logger = get_default_logger()
         logger.debug("PeriodicWorkController: Running periodic tasks...")
         try:

+ 1 - 2
celery/worker/job.py

@@ -9,9 +9,7 @@ from celery.execute import ExecuteWrapper
 from celery.utils import noop, fun_takes_kwargs
 from celery.log import get_default_logger
 from django.core.mail import mail_admins
-import multiprocessing
 import socket
-import sys
 
 
 # pep8.py borks on a inline signature separator and
@@ -170,6 +168,7 @@ class TaskWrapper(object):
                               self.args, task_func_kwargs)
 
     def _set_executed_bit(self):
+        """Set task as executed to make sure it's not executed again."""
         if self.executed:
             raise AlreadyExecutedError(
                    "Task %s[%s] has already been executed" % (