From cc453fcedfef0522b0ee8efeb3285435585c1a2e Mon Sep 17 00:00:00 2001 From: whyour Date: Fri, 7 May 2021 11:56:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=97=B6=E7=A7=BB=E9=99=A4timeout?= =?UTF-8?q?=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shell/task.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 }