Merge pull request #4447 from kobotoolbox/celery-autoscale-clean-up

Clean up Celery autoscale settings

docker/run_celery.bash

@@ -2,9 +2,8 @@
 set -e
 source /etc/profile
 
-# Run the main Celery worker (will not process low priority jobs).
-# Start 2 processes by default; this will be overridden later, in Python code,
-# according to the user's preference saved by django-constance
+# Run the main Celery worker (will NOT process low-priority jobs)
+
 cd "${KPI_SRC_DIR}"
 
 AUTOSCALE_MIN="${CELERY_AUTOSCALE_MIN:-2}"

docker/run_celery_low_priority.bash

@@ -2,11 +2,13 @@
 set -e
 source /etc/profile
 
-# Run the main Celery worker (will process only low priority jobs).
-# Start 2 processes by default; this will be overridden later, in Python code,
-# according to the user's preference saved by django-constance
+# Run the Celery worker for low-priority jobs ONLY
+
 cd "${KPI_SRC_DIR}"
 
+AUTOSCALE_MIN="${CELERY_AUTOSCALE_MIN:-2}"
+AUTOSCALE_MAX="${CELERY_AUTOSCALE_MAX:-6}"
+
 exec celery -A kobo worker --loglevel=info \
     --hostname=kpi_main_worker@%h \
     --logfile=${KPI_LOGS_DIR}/celery_low_priority.log \
@@ -15,4 +17,4 @@ exec celery -A kobo worker --loglevel=info \
     --exclude-queues=kpi_queue \
     --uid=${UWSGI_USER} \
     --gid=${UWSGI_GROUP} \
-    --autoscale 2,2
+    --autoscale ${AUTOSCALE_MIN},${AUTOSCALE_MAX}