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 | |
|---|---|---|---|
|
|
4697428c50 | ||
|
|
306e17eb4d | ||
|
|
d75c7ad418 |
@@ -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
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user