set exit timeout if no timeout is given

Koed00 · Jul 7, 2015 · 729abaf · 729abaf
1 parent 2b3c29b
commit 729abaf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/django_q/cluster.py b/django_q/cluster.py
@@ -275,8 +275,10 @@ def stop(self):
         # Wait for the result queue to empty
         self.result_queue.join_thread()
         logger.info('{} waiting for the monitor.'.format(name))
-        count = 0
         # Wait for everything to close or time out
+        count = 0
+        if not self.timeout:
+            self.timeout = 30
         while self.status() == Conf.STOPPING and count < self.timeout * 5:
             sleep(0.2)
             Stat(self).save()

diff --git a/django_q/tests/settings.py b/django_q/tests/settings.py
@@ -103,6 +103,4 @@
 STATIC_URL = '/static/'
 
 # Django Q specific
-Q_CLUSTER = {'name': 'django_q_test',
-             'timeout': 60,
-             'recycle': 100}
+Q_CLUSTER = {'name': 'django_q_test'}