Browse Source

.concurrency.processes.pool.WorkerLostError moved -> .exceptions.WorkerLostError

Ask Solem 14 years ago
parent
commit
8fb16ea6fb
3 changed files with 3 additions and 11 deletions
  1. 1 9
      celery/concurrency/processes/pool.py
  2. 1 1
      celery/exceptions.py
  3. 1 1
      celery/worker/job.py

+ 1 - 9
celery/concurrency/processes/pool.py

@@ -25,6 +25,7 @@ from multiprocessing import Process, cpu_count, TimeoutError
 from multiprocessing.util import Finalize, debug
 
 from celery.exceptions import SoftTimeLimitExceeded, TimeLimitExceeded
+from celery.exceptions import WorkerLostError
 
 #
 # Constants representing the state of a pool
@@ -44,15 +45,6 @@ READY = 1
 # Signal used for soft time limits.
 SIG_SOFT_TIMEOUT = getattr(signal, "SIGUSR1", None)
 
-#
-# Exceptions
-#
-
-
-class WorkerLostError(Exception):
-    """The worker processing a job has exited prematurely."""
-    pass
-
 #
 # Miscellaneous
 #

+ 1 - 1
celery/exceptions.py

@@ -26,7 +26,7 @@ class SoftTimeLimitExceeded(Exception):
 
 
 class WorkerLostError(Exception):
-    """The worker processing a task has exited prematurely."""
+    """The worker processing a job has exited prematurely."""
     pass
 
 

+ 1 - 1
celery/worker/job.py

@@ -8,9 +8,9 @@ from datetime import datetime
 
 from celery import platforms
 from celery.app import app_or_default
-from celery.concurrency.processes.pool import WorkerLostError
 from celery.datastructures import ExceptionInfo
 from celery.exceptions import SoftTimeLimitExceeded, TimeLimitExceeded
+from celery.exceptions import WorkerLostError
 from celery.execute.trace import TaskTrace
 from celery.registry import tasks
 from celery.utils import noop, kwdict, fun_takes_kwargs