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