diff --git a/back/services/cron.ts b/back/services/cron.ts index 3b772b06..8a7e7cc8 100644 --- a/back/services/cron.ts +++ b/back/services/cron.ts @@ -502,7 +502,7 @@ export default class CronService { if (!command.startsWith(TASK_PREFIX) && !command.startsWith(QL_PREFIX)) { command = `${TASK_PREFIX}${tab.command}`; } - let commandVariable = `ID=${tab.id} ` + let commandVariable = `no_tee=true ID=${tab.id} ` if (tab.task_before) { commandVariable += `task_before='${tab.task_before.replace(/'/g, "'\\''") .trim()}' `; diff --git a/shell/task.sh b/shell/task.sh index 1acd1a66..f6eeea12 100755 --- a/shell/task.sh +++ b/shell/task.sh @@ -70,10 +70,10 @@ handle_log_path() { log_path="$real_log_path" fi - cmd=">> $dir_log/$log_path 2>&1" + cmd="2>&1 | tee -a $dir_log/$log_path" make_dir "$dir_log/$log_dir" - if [[ "$show_log" == "true" ]]; then - cmd="2>&1 | tee -a $dir_log/$log_path" + if [[ "$no_tee" == "true" ]]; then + cmd=">> $dir_log/$log_path 2>&1" fi if [[ "$real_time" == "true" ]]; then @@ -139,7 +139,4 @@ handle_log_path "${task_shell_params[@]}" init_begin_time 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