From bea86968f22356d234372dc8c60fa1e7b20cd01c Mon Sep 17 00:00:00 2001 From: whyour Date: Wed, 12 May 2021 14:14:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9D=92=E9=BE=99=E9=87=8D?= =?UTF-8?q?=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/docker-entrypoint.sh | 4 ++-- shell/update.sh | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index acec55e1..e197a943 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -19,12 +19,12 @@ echo -e "nginx启动成功...\n" echo -e "======================4. 启动控制面板========================\n" cd $dir_root -pm2 reload panel 2>/dev/null || pm2 start $dir_root/build/app.js -n panel --watch $dir_root/build +pm2 reload panel 2>/dev/null || pm2 start $dir_root/build/app.js -n panel echo -e "控制面板启动成功...\n" echo -e "======================5. 启动定时任务========================\n" cd $dir_root -pm2 reload schedule 2>/dev/null || pm2 start $dir_root/build/schedule.js -n schedule --watch $dir_root/build +pm2 reload schedule 2>/dev/null || pm2 start $dir_root/build/schedule.js -n schedule echo -e "定时任务启动成功...\n" if [[ $AutoStartBot == true ]]; then diff --git a/shell/update.sh b/shell/update.sh index 157bf1a8..8754c2c3 100755 --- a/shell/update.sh +++ b/shell/update.sh @@ -256,7 +256,10 @@ update_qinglong() { if [[ $exit_status -eq 0 ]]; then echo -e "重启青龙面板...\n" - sleep 5 + cd $dir_root + pm2 reload panel 2>/dev/null || pm2 start $dir_root/build/app.js -n panel + + pm2 reload schedule 2>/dev/null || pm2 start $dir_root/build/schedule.js -n schedule nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf echo -e "重启面板完成...\n" fi