Reworking the celery init on k8s so I can see logging

cds-snc · Oct 11, 2023 · ea7c4c2 · ea7c4c2
1 parent d45511d
commit ea7c4c2
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 49 deletions.
diff --git a/scripts/run_celery.sh b/scripts/run_celery.sh
@@ -2,27 +2,21 @@
 
 # runs celery with all celery queues except the throtted sms queue
 
-init()
-{
-    # Wait for cwagent to become available.
+set -e
 
+# Check and see if this is running in K8s and if so, wait for cloudwatch agent
+if [[ -z "${STATSD_HOST}" ]]; then
+    echo "Initializing... Waiting for CWAgent to become ready."
     while :
     do
         if  nc -vz $STATSD_HOST 25888; then
-            echo "CWAgent is Ready."
+            echo "CWAgent is Ready." > /dev/stderr
             break;
         else
-            echo "Waiting for CWAgent to become ready."
+            echo "Waiting for CWAgent to become ready." > /dev/stderr
             sleep 1
         fi
     done
-}
-
-set -e
-
-# Check and see if this is running in K8s and if so, wait for cloudwatch agent
-if [[ -z "${STATSD_HOST}" ]]; then
-    init
 fi
 
 echo "Start celery, concurrency: ${CELERY_CONCURRENCY-4}"

diff --git a/scripts/run_celery_no_sms_sending.sh b/scripts/run_celery_no_sms_sending.sh
@@ -2,28 +2,23 @@
 
 # runs celery with only the throttled sms sending queue
 
-init()
-{
-     # Wait for cwagent to become available.   
+# runs celery with all celery queues except send-throttled-sms-tasks, send-sms-tasks, send-sms-high, send-sms-medium, or send-sms-low
+
+set -e
+
+# Check and see if this is running in K8s and if so, wait for cloudwatch agent
+if [[ -z "${STATSD_HOST}" ]]; then
+    echo "Initializing... Waiting for CWAgent to become ready."
     while :
     do
         if  nc -vz $STATSD_HOST 25888; then
-            echo "CWAgent is Ready."
+            echo "CWAgent is Ready." > /dev/stderr
             break;
         else
-            echo "Waiting for CWAgent to become ready."
+            echo "Waiting for CWAgent to become ready." > /dev/stderr
             sleep 1
         fi
     done
-}
-
-# runs celery with all celery queues except send-throttled-sms-tasks, send-sms-tasks, send-sms-high, send-sms-medium, or send-sms-low
-
-set -e
-
-# Check and see if this is running in K8s and if so, wait for cloudwatch agent
-if [[ -z "${STATSD_HOST}" ]]; then
-    init
 fi
 
 echo "Start celery, concurrency: ${CELERY_CONCURRENCY-4}"

diff --git a/scripts/run_celery_send_sms.sh b/scripts/run_celery_send_sms.sh
@@ -1,26 +1,20 @@
 #!/bin/sh
 
 # runs celery with only the send-sms-* queues
+set -e
 
-init()
-{
-     # Wait for cwagent to become available.   
+if [[ -z "${STATSD_HOST}" ]]; then
+    echo "Initializing... Waiting for CWAgent to become ready."
     while :
     do
         if  nc -vz $STATSD_HOST 25888; then
-            echo "CWAgent is Ready."
+            echo "CWAgent is Ready." > /dev/stderr
             break;
         else
-            echo "Waiting for CWAgent to become ready."
+            echo "Waiting for CWAgent to become ready." > /dev/stderr
             sleep 1
         fi
     done
-}
-
-set -e
-
-if [[ -z "${STATSD_HOST}" ]]; then
-    init
 fi
 
 echo "Start celery, concurrency: ${CELERY_CONCURRENCY-4}"

diff --git a/scripts/run_celery_sms.sh b/scripts/run_celery_sms.sh
@@ -2,26 +2,20 @@
 
 # runs celery with only the throttled sms sending queue
 
-init()
-{
-     # Wait for cwagent to become available.   
+set -e
+
+if [[ -z "${STATSD_HOST}" ]]; then
+    echo "Initializing... Waiting for CWAgent to become ready."
     while :
     do
         if  nc -vz $STATSD_HOST 25888; then
-            echo "CWAgent is Ready."
+            echo "CWAgent is Ready." > /dev/stderr
             break;
         else
-            echo "Waiting for CWAgent to become ready."
+            echo "Waiting for CWAgent to become ready." > /dev/stderr
             sleep 1
         fi
     done
-}
-
-set -e
-
-# Check and see if this is running in K8s and if so, wait for cloudwatch agent
-if [[ -z "${STATSD_HOST}" ]]; then
-    init
 fi
 
 celery -A run_celery.notify_celery worker --loglevel=INFO --concurrency=1 -Q send-throttled-sms-tasks