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

修复日志结束标识

Browse Source
This commit is contained in:
hanhh 2021-06-25 16:06:12 +08:00
parent 54dd82dc77
commit f3aca5575c
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell/task.sh
View File

@ -90,14 +90,14 @@ run_normal() {
local id=$(cat $list_crontab_user | grep -E "$cmd_task $p1$" | perl -pe "s|.*ID=(.*) $cmd_task $p1$|\1|" | xargs | sed 's/ /","/g') local id=$(cat $list_crontab_user | grep -E "$cmd_task $p1$" | perl -pe "s|.*ID=(.*) $cmd_task $p1$|\1|" | xargs | sed 's/ /","/g')
local begin_time=$(date '+%Y-%m-%d %H:%M:%S') local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
echo -e "开始执行... $begin_time\n" >> $log_path echo -e "## 开始执行... $begin_time\n" >> $log_path
update_cron_status "\"$id\"" "0" update_cron_status "\"$id\"" "0"
timeout $command_timeout_time $which_program $p1 2>&1 | tee -a $log_path timeout $command_timeout_time $which_program $p1 2>&1 | tee -a $log_path
. $file_task_after . $file_task_after
update_cron_status "\"$id\"" "1" update_cron_status "\"$id\"" "1"
local end_time=$(date '+%Y-%m-%d %H:%M:%S') local end_time=$(date '+%Y-%m-%d %H:%M:%S')
local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time"))) local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
echo -e "\n执行结束... $end_time 耗时 $diff_time 秒" >> $log_path echo -e "\n## 执行结束... $end_time 耗时 $diff_time 秒" >> $log_path
} }
## 并发执行时，设定的 RandomDelay 不会生效，即所有任务立即执行 ## 并发执行时，设定的 RandomDelay 不会生效，即所有任务立即执行

16
shell/update.sh
View File

@ -397,18 +397,18 @@ main() {
local begin_time=$(date '+%Y-%m-%d %H:%M:%S') local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
case $p1 in case $p1 in
update) update)
echo -e "开始执行... $begin_time\n" >> $log_path echo -e "## 开始执行... $begin_time\n" >> $log_path
update_qinglong "$2" | tee -a $log_path update_qinglong "$2" | tee -a $log_path
;; ;;
extra) extra)
echo -e "开始执行... $begin_time\n" >> $log_path echo -e "## 开始执行... $begin_time\n" >> $log_path
run_extra_shell | tee -a $log_path run_extra_shell | tee -a $log_path
;; ;;
repo) repo)
get_user_info get_user_info
local name=$(echo "${p2##*/}" | awk -F "." '{print $1}') local name=$(echo "${p2##*/}" | awk -F "." '{print $1}')
log_path="$dir_log/update/${log_time}_$name.log" log_path="$dir_log/update/${log_time}_$name.log"
echo -e "开始执行... $begin_time\n" >> $log_path echo -e "## 开始执行... $begin_time\n" >> $log_path
if [[ -n $p2 ]]; then if [[ -n $p2 ]]; then
update_repo "$p2" "$p3" "$p4" "$p5" "$p6" | tee -a $log_path update_repo "$p2" "$p3" "$p4" "$p5" "$p6" | tee -a $log_path
else else
@ -420,7 +420,7 @@ main() {
get_user_info get_user_info
local name=$(echo "${p2##*/}" | awk -F "." '{print $1}') local name=$(echo "${p2##*/}" | awk -F "." '{print $1}')
log_path="$dir_log/update/${log_time}_$name.log" log_path="$dir_log/update/${log_time}_$name.log"
echo -e "开始执行... $begin_time\n" >> $log_path echo -e "## 开始执行... $begin_time\n" >> $log_path
if [[ -n $p2 ]]; then if [[ -n $p2 ]]; then
update_raw "$p2" | tee -a $log_path update_raw "$p2" | tee -a $log_path
else else
@ -429,15 +429,15 @@ main() {
fi fi
;; ;;
rmlog) rmlog)
echo -e "开始执行... $begin_time\n" >> $log_path echo -e "## 开始执行... $begin_time\n" >> $log_path
. $dir_shell/rmlog.sh "$p2" | tee -a $log_path . $dir_shell/rmlog.sh "$p2" | tee -a $log_path
;; ;;
bot) bot)
echo -e "开始执行... $begin_time\n" >> $log_path echo -e "## 开始执行... $begin_time\n" >> $log_path
. $dir_shell/bot.sh | tee -a $log_path . $dir_shell/bot.sh | tee -a $log_path
;; ;;
reset) reset)
echo -e "开始执行... $begin_time\n" >> $log_path echo -e "## 开始执行... $begin_time\n" >> $log_path
. $dir_shell/reset.sh | tee -a $log_path . $dir_shell/reset.sh | tee -a $log_path
;; ;;
*) *)
@ -447,7 +447,7 @@ main() {
esac esac
local end_time=$(date '+%Y-%m-%d %H:%M:%S') local end_time=$(date '+%Y-%m-%d %H:%M:%S')
local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time"))) local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
echo -e "\n执行结束... $end_time 耗时 $diff_time 秒" >> $log_path echo -e "\n## 执行结束... $end_time 耗时 $diff_time 秒" >> $log_path
} }
main "$@" main "$@"