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

修复task运行指定账号

Browse Source
This commit is contained in:
hanhh 2021-09-24 00:24:54 +08:00
parent 558478be16
commit 4c1551c309
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
shell/task.sh
View File

@ -186,14 +186,19 @@ run_designated() {
local begin_time=$(date '+%Y-%m-%d %H:%M:%S') local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
local begin_timestamp=$(date "+%s" -d "$begin_time") local begin_timestamp=$(date "+%s" -d "$begin_time")
local envs=$(eval echo "\$${env_param}")
local array=($(echo $envs | sed 's/&/ /g'))
local tempArr=$(echo $num_param | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g") local tempArr=$(echo $num_param | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
local runArr=($(eval echo $tempArr)) local runArr=($(eval echo $tempArr))
runArr=($(awk -v RS=' ' '!a[$1]++' <<< ${runArr[@]})) runArr=($(awk -v RS=' ' '!a[$1]++' <<< ${runArr[@]}))
local n=0 local n=0
for i in $runArr; do for i in ${runArr[@]}; do
echo "$i"
array_run[n]=${array[$i - 1]} array_run[n]=${array[$i - 1]}
let n++ let n++
done done
local cookieStr=$(echo ${array_run[*]} | sed 's/\ /\&/g') local cookieStr=$(echo ${array_run[*]} | sed 's/\ /\&/g')
eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
@ -203,8 +208,6 @@ run_designated() {
[[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path" "$begin_timestamp" [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path" "$begin_timestamp"
eval . $file_task_before "$@" $cmd eval . $file_task_before "$@" $cmd
local envs=$(eval echo "\$${env_param}")
local array=($(echo $envs | sed 's/&/ /g'))
[[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr} [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
eval timeout -k 10s $command_timeout_time $which_program $file_param $cmd eval timeout -k 10s $command_timeout_time $which_program $file_param $cmd