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

修复任务并发参数

Browse Source
This commit is contained in:
hanhh 2021-06-20 20:15:29 +08:00
parent 2692351e0a
commit d630f34505
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
shell/task.sh
View File

@ -99,8 +99,13 @@ run_normal() {
run_concurrent() { run_concurrent() {
local p1=$1 local p1=$1
local p3=$3 local p3=$3
if [[ ! $p3 ]]; then
echo -e "\n 缺少并发运行的环境变量参数"
exit 1
fi
local envs=$(eval echo "\$${p3}") local envs=$(eval echo "\$${p3}")
local array=(${envs//&/}) local array=($(echo $envs | sed 's/&/ /g'))
cd $dir_scripts cd $dir_scripts
define_program "$p1" define_program "$p1"
log_dir="$dir_log/${p1%%.*}" log_dir="$dir_log/${p1%%.*}"
@ -109,7 +114,7 @@ run_concurrent() {
echo -e "\n各账号间已经在后台开始并发执行，前台不输入日志，日志直接写入文件中。\n" echo -e "\n各账号间已经在后台开始并发执行，前台不输入日志，日志直接写入文件中。\n"
for i in "${!array[@]}"; do for i in "${!array[@]}"; do
export ${p3}=${array[i]} export ${p3}=${array[i]}
log_path="$log_dir/${log_time}_${user_num}.log" log_path="$log_dir/${log_time}_$((i+1)).log"
timeout $command_timeout_time $which_program $p1 &>$log_path & timeout $command_timeout_time $which_program $p1 &>$log_path &
done done
} }
@ -133,7 +138,7 @@ main() {
1) 1)
run_normal $1 run_normal $1
;; ;;
2) 2|3)
case $2 in case $2 in
now) now)
run_normal $1 $2 run_normal $1 $2