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

修改 task 日志展示逻辑

Browse Source
This commit is contained in:
whyour 2023-10-19 21:36:39 +08:00
parent 43c0cd8132
commit b90243f55c
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
back/services/cron.ts
View File

@ -502,7 +502,7 @@ export default class CronService {
if (!command.startsWith(TASK_PREFIX) && !command.startsWith(QL_PREFIX)) { if (!command.startsWith(TASK_PREFIX) && !command.startsWith(QL_PREFIX)) {
command = `${TASK_PREFIX}${tab.command}`; command = `${TASK_PREFIX}${tab.command}`;
} }
let commandVariable = `ID=${tab.id} ` let commandVariable = `no_tee=true ID=${tab.id} `
if (tab.task_before) { if (tab.task_before) {
commandVariable += `task_before='${tab.task_before.replace(/'/g, "'\\''") commandVariable += `task_before='${tab.task_before.replace(/'/g, "'\\''")
.trim()}' `; .trim()}' `;

9
shell/task.sh
View File

@ -70,10 +70,10 @@ handle_log_path() {
log_path="$real_log_path" log_path="$real_log_path"
fi fi
cmd=">> $dir_log/$log_path 2>&1" cmd="2>&1 | tee -a $dir_log/$log_path"
make_dir "$dir_log/$log_dir" make_dir "$dir_log/$log_dir"
if [[ "$show_log" == "true" ]]; then if [[ "$no_tee" == "true" ]]; then
cmd="2>&1 | tee -a $dir_log/$log_path" cmd=">> $dir_log/$log_path 2>&1"
fi fi
if [[ "$real_time" == "true" ]]; then if [[ "$real_time" == "true" ]]; then
@ -139,7 +139,4 @@ handle_log_path "${task_shell_params[@]}"
init_begin_time init_begin_time
eval . $dir_shell/otask.sh "$cmd" eval . $dir_shell/otask.sh "$cmd"
# mac cat 无法正常退出
# [[ -f "$dir_log/$log_path" ]] && [[ ! $show_log ]] && [[ "$real_time" != "true" ]] && cat "$dir_log/$log_path"
exit 0 exit 0