mirror of
https://github.com/donaldzou/WGDashboard.git
synced 2025-12-16 16:36:17 +00:00
Compare commits
3 Commits
docker-qui
...
dependabot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b6284bde4e | ||
|
|
306e17eb4d | ||
|
|
d75c7ad418 |
@@ -1,6 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
config_file="/data/wg-dashboard.ini"
|
config_file="/data/wg-dashboard.ini"
|
||||||
|
runtime_pid=""
|
||||||
|
|
||||||
trap 'stop_service' SIGTERM
|
trap 'stop_service' SIGTERM
|
||||||
|
|
||||||
@@ -52,7 +53,31 @@ set_ini() {
|
|||||||
|
|
||||||
stop_service() {
|
stop_service() {
|
||||||
echo "[WGDashboard] Stopping WGDashboard..."
|
echo "[WGDashboard] Stopping WGDashboard..."
|
||||||
/bin/bash ./wgd.sh stop
|
|
||||||
|
local max_rounds="10"
|
||||||
|
local round="0"
|
||||||
|
local runtime_pid=""
|
||||||
|
|
||||||
|
while true; do
|
||||||
|
round=$((round + 1))
|
||||||
|
|
||||||
|
if [[ -f ${WGDASH}/src/gunicorn.pid ]]; then
|
||||||
|
runtime_pid=$(cat ${WGDASH}/src/gunicorn.pid)
|
||||||
|
|
||||||
|
echo "Running as PID: ${runtime_pid}"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ $round -eq $max_rounds ]]; then
|
||||||
|
echo "Reached breaking point!"
|
||||||
|
return 1
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
sleep 0.5s
|
||||||
|
done
|
||||||
|
|
||||||
|
kill $runtime_pid
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -192,9 +217,10 @@ 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
|
||||||
|
|
||||||
resolvconf -u
|
/usr/sbin/resolvconf -u
|
||||||
|
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
echo "Loading WGDashboard failed... Look above for details."
|
echo "Loading WGDashboard failed... Look above for details."
|
||||||
@@ -203,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!"
|
||||||
@@ -235,13 +262,10 @@ start_and_monitor() {
|
|||||||
|
|
||||||
else
|
else
|
||||||
tail -f "$latest_error" &
|
tail -f "$latest_error" &
|
||||||
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
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ 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.44
|
||||||
sqlalchemy_utils==0.42.0
|
sqlalchemy_utils==0.42.1
|
||||||
psycopg[binary]==3.3.2
|
psycopg[binary]==3.3.2
|
||||||
PyMySQL==1.1.2
|
PyMySQL==1.1.2
|
||||||
tzlocal==5.3.1
|
tzlocal==5.3.1
|
||||||
|
|||||||
Reference in New Issue
Block a user