open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2026-07-01 04:40:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

移除tee，添加config错误日志捕获，合并并发任务日志

Browse Source
This commit is contained in:
hanhh
2021-08-16 12:16:40 +08:00
parent 7a02fe0d8e
commit 4929fa0440
4 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shell/task.sh
+12 -1
View File
@@ -92,6 +92,8 @@ run_normal() {
local id=$(cat $list_crontab_user | grep -E "$cmd_task $p1" | perl -pe "s|.*ID=(.*) $cmd_task $p1\.*|\1|" | head -1 | awk -F " " '{print $1}')
local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
echo -e "## 开始执行... $begin_time\n" >> $log_path
cat $task_error_log_path >> $log_path
[[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path"
. $file_task_before >> $log_path 2>&1
@@ -124,9 +126,9 @@ run_concurrent() {
local id=$(cat $list_crontab_user | grep -E "$cmd_task $p1" | perl -pe "s|.*ID=(.*) $cmd_task $p1\.*|\1|" | head -1 | awk -F " " '{print $1}')
local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
echo -e "## 开始执行... $begin_time\n" >> $log_path
cat $task_error_log_path >> $log_path
[[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path"
. $file_task_before >> $log_path 2>&1
echo -e "\n各账号间已经在后台开始并发执行，前台不输入日志，日志直接写入文件中。\n" >> $log_path
local envs=$(eval echo "\$${p3}")
local array=($(echo $envs | sed 's/&/ /g'))
@@ -137,6 +139,13 @@ run_concurrent() {
timeout -k 10s $command_timeout_time $which_program $p1 &>$single_log_path 2>&1 &
done
wait
for i in "${!array[@]}"; do
single_log_path="$log_dir/${single_log_time}_$((i + 1)).log"
cat $single_log_path >> $log_path
[ -f $single_log_path ] && rm -f $single_log_path
done
. $file_task_after >> $log_path 2>&1
[[ $id ]] && update_cron "\"$id\"" "1" "" "$log_path"
local end_time=$(date '+%Y-%m-%d %H:%M:%S')
@@ -155,6 +164,8 @@ run_else() {
local id=$(cat $list_crontab_user | grep -E "$cmd_task $p1" | perl -pe "s|.*ID=(.*) $cmd_task $p1\.*|\1|" | head -1 | awk -F " " '{print $1}')
local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
echo -e "## 开始执行... $begin_time\n" >> $log_path
cat $task_error_log_path >> $log_path
[[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path"
. $file_task_before >> $log_path 2>&1