diff --git a/shell/task.sh b/shell/task.sh index ee922618..565eb300 100755 --- a/shell/task.sh +++ b/shell/task.sh @@ -91,11 +91,15 @@ run_normal() { local begin_time=$(date '+%Y-%m-%d %H:%M:%S') echo -e "## 开始执行... $begin_time\n" | tee -a $log_path [[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path" - . $file_task_before + echo -e "\n## task_before开始\n" | tee -a $log_path + . $file_task_before 2>&1 | tee -a $log_path + echo -e "\n## task_before结束" | tee -a $log_path timeout $command_timeout_time $which_program $p1 2>&1 | tee -a $log_path - . $file_task_after + echo -e "\n## task_after开始\n" | tee -a $log_path + . $file_task_after 2>&1 | tee -a $log_path + echo -e "\n## task_after结束\n" | tee -a $log_path [[ $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")))