open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2025-10-31 17:06:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

测试ql update

Browse Source
This commit is contained in:
whyour 2021-05-15 01:18:28 +08:00
parent 427bf44e01
commit 09ab572d79
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell/update.sh
View File

@ -261,9 +261,9 @@ update_qinglong() {
if [[ $exit_status -eq 0 ]]; then if [[ $exit_status -eq 0 ]]; then
echo -e "\n更新$ql_static_repo成功...\n" echo -e "\n更新$ql_static_repo成功...\n"
cp -rf $ql_static_repo/* $dir_root cp -rf $ql_static_repo/* $dir_root
nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
echo -e "重启面板中..." 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 else
echo -e "\n更新$dir_root失败，请检查原因...\n" echo -e "\n更新$dir_root失败，请检查原因...\n"
fi fi

4
src/pages/crontab/logModal.tsx
View File

@ -36,7 +36,9 @@ const CronLogModal = ({
if (localStorage.getItem('logCron') === cron._id) { if (localStorage.getItem('logCron') === cron._id) {
const log = data.data as string; const log = data.data as string;
setValue(log || '暂无日志'); setValue(log || '暂无日志');
setExcuting(log && !log.includes('执行结束')); setExcuting(
log && !log.includes('执行结束') && !log.includes('重启面板'),
);
if (log && !log.includes('执行结束') && !log.includes('重启面板')) { if (log && !log.includes('执行结束') && !log.includes('重启面板')) {
setTimeout(() => { setTimeout(() => {
getCronLog(); getCronLog();