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

恢复定时任务timeout

Browse Source
This commit is contained in:
whyour 2021-05-07 12:05:59 +08:00
parent cc453fcedf
commit bd951db738
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell/task.sh
View File

@ -116,7 +116,7 @@ run_normal () {
log_dir="$dir_log/${p1%%.*}" log_dir="$dir_log/${p1%%.*}"
log_path="$log_dir/$log_time.log" log_path="$log_dir/$log_time.log"
make_dir "$log_dir" make_dir "$log_dir"
$which_program $p1 2>&1 | tee $log_path timeout $CommandTimeoutTime $which_program $p1 2>&1 | tee $log_path
} }
## 并发执行，因为是并发，所以日志只能直接记录在日志文件中（日志文件以Cookie编号结尾），前台执行并发跑时不会输出日志 ## 并发执行，因为是并发，所以日志只能直接记录在日志文件中（日志文件以Cookie编号结尾），前台执行并发跑时不会输出日志
@ -132,7 +132,7 @@ run_concurrent () {
for ((user_num=1; user_num<=$user_sum; user_num++)); do for ((user_num=1; user_num<=$user_sum; user_num++)); do
combine_one $user_num combine_one $user_num
log_path="$log_dir/${log_time}_${user_num}.log" log_path="$log_dir/${log_time}_${user_num}.log"
$which_program $p1 &>$log_path & timeout $CommandTimeoutTime $which_program $p1 &>$log_path &
done done
} }