diff --git a/shell/update.sh b/shell/update.sh index b0474325..256b7018 100755 --- a/shell/update.sh +++ b/shell/update.sh @@ -261,9 +261,9 @@ update_qinglong() { if [[ $exit_status -eq 0 ]]; then echo -e "\n更新$ql_static_repo成功...\n" cp -rf $ql_static_repo/* $dir_root - nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf echo -e "重启面板中..." - pm2 reload all >/dev/null 2>&1 + nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf + sleep 1 && pm2 reload all >/dev/null 2>&1 else echo -e "\n更新$dir_root失败,请检查原因...\n" fi diff --git a/src/pages/crontab/logModal.tsx b/src/pages/crontab/logModal.tsx index 582e3dfc..dc6800f9 100644 --- a/src/pages/crontab/logModal.tsx +++ b/src/pages/crontab/logModal.tsx @@ -36,7 +36,9 @@ const CronLogModal = ({ if (localStorage.getItem('logCron') === cron._id) { const log = data.data as string; setValue(log || '暂无日志'); - setExcuting(log && !log.includes('执行结束')); + setExcuting( + log && !log.includes('执行结束') && !log.includes('重启面板'), + ); if (log && !log.includes('执行结束') && !log.includes('重启面板')) { setTimeout(() => { getCronLog();