From f3aca5575c87de98df3e19179101e919ca1f7571 Mon Sep 17 00:00:00 2001 From: hanhh <18330117883@163.com> Date: Fri, 25 Jun 2021 16:06:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shell/task.sh | 4 ++-- shell/update.sh | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/shell/task.sh b/shell/task.sh index 5a36604d..b16e778a 100755 --- a/shell/task.sh +++ b/shell/task.sh @@ -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 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" timeout $command_timeout_time $which_program $p1 2>&1 | tee -a $log_path . $file_task_after update_cron_status "\"$id\"" "1" local end_time=$(date '+%Y-%m-%d %H:%M:%S') 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 不会生效,即所有任务立即执行 diff --git a/shell/update.sh b/shell/update.sh index cade8f08..d6a7f779 100755 --- a/shell/update.sh +++ b/shell/update.sh @@ -397,18 +397,18 @@ main() { local begin_time=$(date '+%Y-%m-%d %H:%M:%S') case $p1 in update) - echo -e "开始执行... $begin_time\n" >> $log_path + echo -e "## 开始执行... $begin_time\n" >> $log_path update_qinglong "$2" | tee -a $log_path ;; extra) - echo -e "开始执行... $begin_time\n" >> $log_path + echo -e "## 开始执行... $begin_time\n" >> $log_path run_extra_shell | tee -a $log_path ;; repo) get_user_info local name=$(echo "${p2##*/}" | awk -F "." '{print $1}') 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 update_repo "$p2" "$p3" "$p4" "$p5" "$p6" | tee -a $log_path else @@ -420,7 +420,7 @@ main() { get_user_info local name=$(echo "${p2##*/}" | awk -F "." '{print $1}') 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 update_raw "$p2" | tee -a $log_path else @@ -429,15 +429,15 @@ main() { fi ;; rmlog) - echo -e "开始执行... $begin_time\n" >> $log_path + echo -e "## 开始执行... $begin_time\n" >> $log_path . $dir_shell/rmlog.sh "$p2" | tee -a $log_path ;; bot) - echo -e "开始执行... $begin_time\n" >> $log_path + echo -e "## 开始执行... $begin_time\n" >> $log_path . $dir_shell/bot.sh | tee -a $log_path ;; reset) - echo -e "开始执行... $begin_time\n" >> $log_path + echo -e "## 开始执行... $begin_time\n" >> $log_path . $dir_shell/reset.sh | tee -a $log_path ;; *) @@ -447,7 +447,7 @@ main() { esac local end_time=$(date '+%Y-%m-%d %H:%M:%S') 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 "$@"