Merge branch 'main' into docker-quit-update

docker/entrypoint.sh

@@ -53,10 +53,13 @@ set_ini() {
 
 stop_service() {
   echo "[WGDashboard] Stopping WGDashboard..."
+  kill $runtime_pid
+  exit 0
+}
 
-  local max_rounds="10"
+grab_pid() {
-  local round="0"
+  max_rounds="10"
-  local runtime_pid=""
+  round="0"
 
   while true; do
     round=$((round + 1))
@@ -77,8 +80,6 @@ stop_service() {
     sleep 0.5s
   done
 
-  kill $runtime_pid
-  exit 0
 }
 
 echo "------------------------- START ----------------------------"
@@ -217,7 +218,6 @@ start_and_monitor() {
 
   [[ ! -d ${WGDASH}/src/log ]] && mkdir ${WGDASH}/src/log
   [[ ! -d ${WGDASH}/src/download ]] && mkdir ${WGDASH}/src/download
-
   ${WGDASH}/src/venv/bin/gunicorn --config ${WGDASH}/src/gunicorn.conf.py
 
   /usr/sbin/resolvconf -u
@@ -229,14 +229,13 @@ start_and_monitor() {
   # Wait a second before continuing, to give the python program some time to get ready.
   echo -e "\nEnsuring container continuation."
 
-  local max_rounds="10"
+  max_rounds="10"
-  local round="0"
+  round="0"
 
   # Hang in there for 10s for Gunicorn to get ready
   while true; do
     round=$((round + 1))
-
+    latest_error=$(ls -t ${WGDASH}/src/log/error_*.log 2> /dev/null | head -n 1)
-    local latest_error=$(ls -t ${WGDASH}/src/log/error_*.log 2> /dev/null | head -n 1)
 
     if [[ $round -eq $max_rounds ]]; then
       echo "Reached breaking point!"
@@ -264,8 +263,15 @@ start_and_monitor() {
     tail -f "$latest_error" &
     tail_pid=$!
 
+    echo "Grabbing PID..."
+    grab_pid &
+
     wait $tail_pid
   fi
+
+  echo "The blocking command has been broken! Script will exit in 3 minutes... Investigate!"
+  sleep 180s
+  exit 1
 }
 
 # Main execution flow

src/requirements.txt

@@ -9,7 +9,7 @@ gunicorn==23.0.0
 requests==2.32.5
 tcconfig==0.30.1
 sqlalchemy==2.0.44
-sqlalchemy_utils==0.42.1
+sqlalchemy_utils==0.42.0
 psycopg[binary]==3.3.2
 PyMySQL==1.1.2
 tzlocal==5.3.1