@whyour/qinglong 0.12.0 → 0.12.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/shell/share.sh +0 -2
- package/shell/task.sh +3 -6
- package/static/build/services/cron.js +1 -1
- package/version.yaml +1 -1
package/package.json
CHANGED
package/shell/share.sh
CHANGED
package/shell/task.sh
CHANGED
|
@@ -70,10 +70,10 @@ handle_log_path() {
|
|
|
70
70
|
log_path="$real_log_path"
|
|
71
71
|
fi
|
|
72
72
|
|
|
73
|
-
cmd="
|
|
73
|
+
cmd="2>&1 | tee -a $dir_log/$log_path"
|
|
74
74
|
make_dir "$dir_log/$log_dir"
|
|
75
|
-
if [[ "$
|
|
76
|
-
cmd="
|
|
75
|
+
if [[ "$no_tee" == "true" ]]; then
|
|
76
|
+
cmd=">> $dir_log/$log_path 2>&1"
|
|
77
77
|
fi
|
|
78
78
|
|
|
79
79
|
if [[ "$real_time" == "true" ]]; then
|
|
@@ -139,7 +139,4 @@ handle_log_path "${task_shell_params[@]}"
|
|
|
139
139
|
init_begin_time
|
|
140
140
|
|
|
141
141
|
eval . $dir_shell/otask.sh "$cmd"
|
|
142
|
-
# mac cat 无法正常退出
|
|
143
|
-
# [[ -f "$dir_log/$log_path" ]] && [[ ! $show_log ]] && [[ "$real_time" != "true" ]] && cat "$dir_log/$log_path"
|
|
144
|
-
|
|
145
142
|
exit 0
|
|
@@ -439,7 +439,7 @@ let CronService = class CronService {
|
|
|
439
439
|
if (!command.startsWith(const_1.TASK_PREFIX) && !command.startsWith(const_1.QL_PREFIX)) {
|
|
440
440
|
command = `${const_1.TASK_PREFIX}${tab.command}`;
|
|
441
441
|
}
|
|
442
|
-
let commandVariable = `ID=${tab.id} `;
|
|
442
|
+
let commandVariable = `no_tee=true ID=${tab.id} `;
|
|
443
443
|
if (tab.task_before) {
|
|
444
444
|
commandVariable += `task_before='${tab.task_before.replace(/'/g, "'\\''")
|
|
445
445
|
.trim()}' `;
|