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/after 逻辑

Browse Source
This commit is contained in:
whyour 2023-01-20 23:38:32 +08:00
parent 7cfb125682
commit 8ad26267d8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shell/otask.sh
View File

@ -101,6 +101,8 @@ handle_task_before() {
begin_time=$(format_time "$time_format" "$time") begin_time=$(format_time "$time_format" "$time")
begin_timestamp=$(format_timestamp "$time_format" "$time") begin_timestamp=$(format_timestamp "$time_format" "$time")
[[ $ID ]] && update_cron "\"$ID\"" "0" "$$" "$log_path" "$begin_timestamp"
echo -e "## 开始执行... $begin_time\n" echo -e "## 开始执行... $begin_time\n"
[[ $is_macos -eq 0 ]] && check_server [[ $is_macos -eq 0 ]] && check_server
@ -111,7 +113,6 @@ handle_task_before() {
eval echo $cmd eval echo $cmd
fi fi
[[ $ID ]] && update_cron "\"$ID\"" "0" "$$" "$log_path" "$begin_timestamp"
. $file_task_before "$@" . $file_task_before "$@"
} }
@ -123,9 +124,10 @@ handle_task_after() {
local end_timestamp=$(format_timestamp "$time_format" "$etime") local end_timestamp=$(format_timestamp "$time_format" "$etime")
local diff_time=$(($end_timestamp - $begin_timestamp)) local diff_time=$(($end_timestamp - $begin_timestamp))
[[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
echo -e "\n\n## 执行结束... $end_time 耗时 $diff_time 秒" echo -e "\n\n## 执行结束... $end_time 耗时 $diff_time 秒"
echo -e "\n　　　　　" echo -e "\n　　　　　"
[[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
} }
## 正常运行单个脚本，$1：传入参数 ## 正常运行单个脚本，$1：传入参数