Moving cwagent check outside of run celery (#2027)

* Moving cwagent check outside of run celery * making cwagent check executable * added shebang
cds-snc · Nov 20, 2023 · a7b6726 · a7b6726
1 parent 203307f
commit a7b6726
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 126 deletions.
diff --git a/scripts/cwcheck.sh b/scripts/cwcheck.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+# Check and see if this is running in K8s and if so, wait for cloudwatch agent
+if [ -n "${STATSD_HOST}" ]; then
+    echo "Initializing... Waiting for CWAgent to become ready within the next 30 seconds."
+    timeout=30
+    while [ $timeout -gt 0 ]; do
+        if nc -vz "$STATSD_HOST" 25888; then
+            echo "CWAgent is Ready."
+            break
+        else
+            echo "Waiting for CWAgent to become ready."
+            sleep 1
+            timeout=$((timeout - 1))
+        fi
+    done
+
+    if [ $timeout -eq 0 ]; then
+        echo "Timeout reached. CWAgent did not become ready in 30 seconds."
+        exit 1
+    fi
+fi
diff --git a/scripts/run_celery.sh b/scripts/run_celery.sh
@@ -4,27 +4,6 @@ set -e
 
 # Runs celery with all celery queues except the throtted sms queue.
 
-# Check and see if this is running in K8s and if so, wait for cloudwatch agent
-if [ -n "${STATSD_HOST}" ]; then
-    echo "Initializing... Waiting for CWAgent to become ready within the next 30 seconds."
-    timeout=30
-    while [ $timeout -gt 0 ]; do
-        if nc -vz "$STATSD_HOST" 25888; then
-            echo "CWAgent is Ready."
-            break
-        else
-            echo "Waiting for CWAgent to become ready."
-            sleep 1
-            timeout=$((timeout - 1))
-        fi
-    done
-
-    if [ $timeout -eq 0 ]; then
-        echo "Timeout reached. CWAgent did not become ready in 30 seconds."
-        exit 1
-    fi
-fi
-
 echo "Start celery, concurrency: ${CELERY_CONCURRENCY-4}"
 
 celery -A run_celery.notify_celery worker --pidfile="/tmp/celery.pid" --loglevel=INFO --concurrency="${CELERY_CONCURRENCY-4}" -Q database-tasks,-priority-database-tasks.fifo,-normal-database-tasks,-bulk-database-tasks,job-tasks,notify-internal-tasks,periodic-tasks,priority-tasks,normal-tasks,bulk-tasks,reporting-tasks,research-mode-tasks,retry-tasks,send-sms-tasks,send-sms-high,send-sms-medium,send-sms-low,send-email-tasks,service-callbacks,delivery-receipts
diff --git a/scripts/run_celery_beat.sh b/scripts/run_celery_beat.sh
@@ -4,25 +4,4 @@ set -e
 
 # Runs the celery beat process, i.e the Celery periodic tasks.
 
-# Check and see if this is running in K8s and if so, wait for cloudwatch agent
-if [ -n "${STATSD_HOST}" ]; then
-    echo "Initializing... Waiting for CWAgent to become ready within the next 30 seconds."
-    timeout=30
-    while [ $timeout -gt 0 ]; do
-        if nc -vz "$STATSD_HOST" 25888; then
-            echo "CWAgent is Ready."
-            break
-        else
-            echo "Waiting for CWAgent to become ready."
-            sleep 1
-            timeout=$((timeout - 1))
-        fi
-    done
-
-    if [ $timeout -eq 0 ]; then
-        echo "Timeout reached. CWAgent did not become ready in 30 seconds."
-        exit 1
-    fi
-fi
-
 celery -A run_celery.notify_celery beat --loglevel=INFO
diff --git a/scripts/run_celery_core_tasks.sh b/scripts/run_celery_core_tasks.sh
@@ -5,27 +5,6 @@ set -e
 # Runs celery with all celery queues except send-throttled-sms-tasks, 
 # send-sms-* and send-email-*.
 
-# Check and see if this is running in K8s and if so, wait for cloudwatch agent
-if [ -n "${STATSD_HOST}" ]; then
-    echo "Initializing... Waiting for CWAgent to become ready within the next 30 seconds."
-    timeout=30
-    while [ $timeout -gt 0 ]; do
-        if nc -vz "$STATSD_HOST" 25888; then
-            echo "CWAgent is Ready."
-            break
-        else
-            echo "Waiting for CWAgent to become ready."
-            sleep 1
-            timeout=$((timeout - 1))
-        fi
-    done
-
-    if [ $timeout -eq 0 ]; then
-        echo "Timeout reached. CWAgent did not become ready in 30 seconds."
-        exit 1
-    fi
-fi
-
 echo "Start celery, concurrency: ${CELERY_CONCURRENCY-4}"
 
 celery -A run_celery.notify_celery worker --pidfile="/tmp/celery.pid" --loglevel=INFO --concurrency="${CELERY_CONCURRENCY-4}" -Q database-tasks,-priority-database-tasks.fifo,-normal-database-tasks,-bulk-database-tasks,job-tasks,notify-internal-tasks,periodic-tasks,priority-tasks,normal-tasks,bulk-tasks,reporting-tasks,research-mode-tasks,retry-tasks,service-callbacks,delivery-receipts
diff --git a/scripts/run_celery_send_email.sh b/scripts/run_celery_send_email.sh
@@ -4,27 +4,6 @@ set -e
 
 # Runs celery with only the send-email-* queues.
 
-# Check and see if this is running in K8s and if so, wait for cloudwatch agent
-if [ -n "${STATSD_HOST}" ]; then
-    echo "Initializing... Waiting for CWAgent to become ready within the next 30 seconds."
-    timeout=30
-    while [ $timeout -gt 0 ]; do
-        if nc -vz "$STATSD_HOST" 25888; then
-            echo "CWAgent is Ready."
-            break
-        else
-            echo "Waiting for CWAgent to become ready."
-            sleep 1
-            timeout=$((timeout - 1))
-        fi
-    done
-
-    if [ $timeout -eq 0 ]; then
-        echo "Timeout reached. CWAgent did not become ready in 30 seconds."
-        exit 1
-    fi
-fi
-
 echo "Start celery, concurrency: ${CELERY_CONCURRENCY-4}"
 
 # TODO: we shouldn't be using the send-email-tasks queue anymore, once we verify this we can remove it

diff --git a/scripts/run_celery_send_sms.sh b/scripts/run_celery_send_sms.sh
@@ -4,27 +4,6 @@ set -e
 
 # Runs celery with only the send-sms-* queues.
 
-# Check and see if this is running in K8s and if so, wait for cloudwatch agent
-if [ -n "${STATSD_HOST}" ]; then
-    echo "Initializing... Waiting for CWAgent to become ready within the next 30 seconds."
-    timeout=30
-    while [ $timeout -gt 0 ]; do
-        if nc -vz "$STATSD_HOST" 25888; then
-            echo "CWAgent is Ready."
-            break
-        else
-            echo "Waiting for CWAgent to become ready."
-            sleep 1
-            timeout=$((timeout - 1))
-        fi
-    done
-
-    if [ $timeout -eq 0 ]; then
-        echo "Timeout reached. CWAgent did not become ready in 30 seconds."
-        exit 1
-    fi
-fi
-
 echo "Start celery, concurrency: ${CELERY_CONCURRENCY-4}"
 
 # TODO: we shouldn't be using the send-sms-tasks queue anymore - once we verify this we can remove it

diff --git a/scripts/run_celery_sms.sh b/scripts/run_celery_sms.sh
@@ -4,25 +4,4 @@ set -e
 
 # Runs celery with only the throttled sms sending queue.
 
-# Check and see if this is running in K8s and if so, wait for cloudwatch agent
-if [ -n "${STATSD_HOST}" ]; then
-    echo "Initializing... Waiting for CWAgent to become ready within the next 30 seconds."
-    timeout=30
-    while [ $timeout -gt 0 ]; do
-        if nc -vz "$STATSD_HOST" 25888; then
-            echo "CWAgent is Ready."
-            break
-        else
-            echo "Waiting for CWAgent to become ready."
-            sleep 1
-            timeout=$((timeout - 1))
-        fi
-    done
-
-    if [ $timeout -eq 0 ]; then
-        echo "Timeout reached. CWAgent did not become ready in 30 seconds."
-        exit 1
-    fi
-fi
-
 celery -A run_celery.notify_celery worker --loglevel=INFO --concurrency=1 -Q send-throttled-sms-tasks