Browse Source

Supervisor: Accidentally removed keyword argument join_timeout

Ask Solem 15 years ago
parent
commit
4592b79e89
1 changed files with 2 additions and 1 deletions
  1. 2 1
      celery/supervisor.py

+ 2 - 1
celery/supervisor.py

@@ -64,12 +64,13 @@ class OFASupervisor(object):
 
 
     def __init__(self, target, args=None, kwargs=None,
     def __init__(self, target, args=None, kwargs=None,
             max_restart_freq=MAX_RESTART_FREQ,
             max_restart_freq=MAX_RESTART_FREQ,
+            join_timeout=JOIN_TIMEOUT,
             max_restart_freq_time=MAX_RESTART_FREQ_TIME,
             max_restart_freq_time=MAX_RESTART_FREQ_TIME,
             check_interval=CHECK_INTERVAL):
             check_interval=CHECK_INTERVAL):
         self.target = target
         self.target = target
+        self.join_timeout = join_timeout
         self.args = args or []
         self.args = args or []
         self.kwargs = kwargs or {}
         self.kwargs = kwargs or {}
-        self.join_timeout = join_timeout
         self.check_interval = check_interval
         self.check_interval = check_interval
         self.max_restart_freq = max_restart_freq
         self.max_restart_freq = max_restart_freq
         self.max_restart_freq_time = max_restart_freq_time
         self.max_restart_freq_time = max_restart_freq_time