Merge branch 'develop' of github.com:Gillingham/evething into develop

Author: Gillingham

evething/local_settings.example

@@ -66,6 +66,9 @@ ONLY_NEW_APIKEYS = True
 # Allow new users to register
 ALLOW_REGISTRATION = False
 
+# Default stagger APITask calls on startup
+STAGGER_APITASK_STARTUP = True
+
 # Celery broker URL - http://docs.celeryproject.org/en/latest/getting-started/first-steps-with-celery.html#choosing-a-broker
 BROKER_URL = 'amqp://guest:guest@localhost:5672/'
 

evething/settings.py

@@ -170,6 +170,9 @@
 # without updating local_settings, it won't error
 ALLOW_REGISTRATION = False
 
+# Default stagger APITask calls on startup
+STAGGER_APITASK_STARTUP = True
+
 # load local settings
 from local_settings import *
 MANAGERS = ADMINS

thing/tasks/apitask.py

@@ -102,7 +102,7 @@ def init(self, taskstate_id=None, apikey_id=None):
 
         # Sleep for staggered worker startup
         global this_process
-        if this_process is None:
+        if this_process is None and settings.STAGGER_APITASK_STARTUP:
             this_process = int(current_process()._name.split('-')[1])
             sleep_for = (this_process - 1) * 2
             self._logger.warning('Worker #%d staggered startup: sleeping for %d seconds', this_process, sleep_for)