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

修改task_before逻辑

Browse Source
This commit is contained in:
hanhh 2021-07-22 19:13:54 +08:00
parent b183e9cd29
commit 7ced425e01
1 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
shell/task.sh
View File

@ -93,19 +93,11 @@ run_normal() {
local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
echo -e "## 开始执行... $begin_time\n" | tee -p -a $log_path
[[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path"
if [[ ! $(. $file_task_before 1>/dev/null) ]]; then
. $file_task_before
else
echo -e "## task_before执行失败，自行检查\n" | tee -p -a $log_path
fi
timeout -k 10s $command_timeout_time $which_program $p1 2>&1 | tee -p -a $log_path
if [[ ! $(. $file_task_after 1>/dev/null) ]]; then
. $file_task_after
else
echo -e "## task_after执行失败，自行检查\n" | tee -p -a $log_path
fi
[[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path"
local end_time=$(date '+%Y-%m-%d %H:%M:%S')
local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
@ -135,11 +127,7 @@ run_concurrent() {
local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
echo -e "## 开始执行... $begin_time\n" | tee -p -a $log_path
[[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path"
if [[ ! $(. $file_task_before 1>/dev/null) ]]; then
. $file_task_before
else
echo -e "## task_before执行失败，自行检查\n" | tee -p -a $log_path
fi
echo -e "\n各账号间已经在后台开始并发执行，前台不输入日志，日志直接写入文件中。\n" | tee -p -a $log_path
single_log_time=$(date "+%Y-%m-%d-%H-%M-%S.%N")
@ -149,11 +137,7 @@ run_concurrent() {
timeout -k 10s $command_timeout_time $which_program $p1 &>$single_log_path &
done
if [[ ! $(. $file_task_after 1>/dev/null) ]]; then
. $file_task_after
else
echo -e "## task_after执行失败，自行检查\n" | tee -p -a $log_path
fi
[[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path"
local end_time=$(date '+%Y-%m-%d %H:%M:%S')
local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
@ -172,19 +156,11 @@ run_else() {
local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
echo -e "## 开始执行... $begin_time\n" | tee -p -a $log_path
[[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path"
if [[ ! $(. $file_task_before 1>/dev/null) ]]; then
. $file_task_before
else
echo -e "## task_before执行失败，自行检查\n" | tee -p -a $log_path
fi
timeout -k 10s $command_timeout_time bash -c "$@" 2>&1 | tee -p -a $log_path
timeout -k 10s $command_timeout_time "$@" 2>&1 | tee -p -a $log_path
if [[ ! $(. $file_task_after 1>/dev/null) ]]; then
. $file_task_after
else
echo -e "## task_after执行失败，自行检查\n" | tee -p -a $log_path
fi
[[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path"
local end_time=$(date '+%Y-%m-%d %H:%M:%S')
local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))