Compare commits

..

3 Commits

Author SHA1 Message Date
dependabot[bot]
4697428c50 build(deps): bump sqlalchemy from 2.0.44 to 2.0.45 in /src
Bumps [sqlalchemy](https://github.com/sqlalchemy/sqlalchemy) from 2.0.44 to 2.0.45.
- [Release notes](https://github.com/sqlalchemy/sqlalchemy/releases)
- [Changelog](https://github.com/sqlalchemy/sqlalchemy/blob/main/CHANGES.rst)
- [Commits](https://github.com/sqlalchemy/sqlalchemy/commits)

---
updated-dependencies:
- dependency-name: sqlalchemy
  dependency-version: 2.0.45
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-12-15 20:31:39 +00:00
Daan Selen
306e17eb4d refac: some exit logic
Some checks failed
CodeQL / Analyze (javascript) (push) Has been cancelled
CodeQL / Analyze (python) (push) Has been cancelled
Docker Build and Push / docker_build (push) Has been cancelled
Docker Build and Push / docker_scan (push) Has been cancelled
Mark stale issues and pull requests / stale (push) Has been cancelled
2025-12-14 20:56:18 +01:00
DaanSelen
d75c7ad418 feat: add better docker stopping response (#1025) 2025-12-14 17:32:46 +01:00
2 changed files with 11 additions and 17 deletions

View File

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

View File

@@ -8,7 +8,7 @@ icmplib==3.0.4
gunicorn==23.0.0 gunicorn==23.0.0
requests==2.32.5 requests==2.32.5
tcconfig==0.30.1 tcconfig==0.30.1
sqlalchemy==2.0.44 sqlalchemy==2.0.45
sqlalchemy_utils==0.42.0 sqlalchemy_utils==0.42.0
psycopg[binary]==3.3.2 psycopg[binary]==3.3.2
PyMySQL==1.1.2 PyMySQL==1.1.2