From 082acc2fb513f725f3a83443a60af31c71fb96ec Mon Sep 17 00:00:00 2001 From: whyour Date: Tue, 4 May 2021 13:01:47 +0800 Subject: [PATCH] =?UTF-8?q?pm2=20restart=E6=9B=BF=E6=8D=A2=E6=88=90reload?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/services/cron.ts | 2 +- docker/docker-entrypoint.sh | 4 ++-- shell/update.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/back/services/cron.ts b/back/services/cron.ts index de49f013..64020020 100644 --- a/back/services/cron.ts +++ b/back/services/cron.ts @@ -209,7 +209,7 @@ export default class CronService { fs.writeFileSync(config.crontabFile, crontab_string); execSync(`crontab ${config.crontabFile}`); - exec(`pm2 restart schedule`); + exec(`pm2 reload schedule`); this.cronDb.update({}, { $set: { saved: true } }, { multi: true }); } diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 57bfe505..afa0a054 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 restart panel 2>/dev/null || pm2 start $dir_root/build/app.js -n panel +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 restart schedule 2>/dev/null || pm2 start $dir_root/build/schedule.js -n schedule +pm2 reload schedule 2>/dev/null || pm2 start $dir_root/build/schedule.js -n schedule echo -e "定时任务启动成功...\n" echo -e "############################################################" diff --git a/shell/update.sh b/shell/update.sh index b192da10..214c0a27 100755 --- a/shell/update.sh +++ b/shell/update.sh @@ -326,12 +326,12 @@ restart_qinglong() { echo -e "重新编译青龙完成...\n" echo -e "重启青龙面板...\n" - pm2 restart panel 2>/dev/null || pm2 start $dir_root/build/app.js -n panel + pm2 reload panel 2>/dev/null || pm2 start $dir_root/build/app.js -n panel nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf echo -e "重启面板完成...\n" echo -e "重启定时任务...\n" - pm2 restart schedule 2>/dev/null || pm2 start $dir_root/build/schedule.js -n schedule + pm2 reload schedule 2>/dev/null || pm2 start $dir_root/build/schedule.js -n schedule echo -e "重启定时完成...\n" fi }