mirror of
https://github.com/whyour/qinglong.git
synced 2026-06-30 20:35:09 +08:00
重构任务日志，修复手动停止任务
This commit is contained in:
hanhh
+8
-6
@@ -148,9 +148,11 @@ get_user_info() {
|
||||
fi
|
||||
}
|
||||
|
||||
update_cron_status() {
|
||||
local ids=$1
|
||||
local status=$2
|
||||
update_cron() {
|
||||
local ids="$1"
|
||||
local status="$2"
|
||||
local pid="${3:-''}"
|
||||
local logPath="$4"
|
||||
local currentTimeStamp=$(date +%s)
|
||||
local api=$(
|
||||
curl -s --noproxy "*" "http://localhost:5600/api/crons/status?t=$currentTimeStamp" \
|
||||
@@ -162,15 +164,15 @@ update_cron_status() {
|
||||
-H "Origin: http://localhost:5700" \
|
||||
-H "Referer: http://localhost:5700/crontab" \
|
||||
-H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
|
||||
--data-raw "{\"ids\":[$ids],\"status\":\"$status\"}" \
|
||||
--data-raw "{\"ids\":[$ids],\"status\":\"$status\",\"pid\":\"$pid\",\"log_path\":\"$logPath\"}" \
|
||||
--compressed
|
||||
)
|
||||
code=$(echo $api | jq -r .code)
|
||||
message=$(echo $api | jq -r .message)
|
||||
if [[ $code == 200 ]]; then
|
||||
echo -e "更新任务状态成功"
|
||||
echo -e "更新任务状态成功" | tee -a $log_path
|
||||
else
|
||||
echo -e "更新任务状态失败(${message})"
|
||||
echo -e "更新任务状态失败(${message})" | tee -a $log_path
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
+42
-11
@@ -76,7 +76,6 @@ run_normal() {
|
||||
local p1=$1
|
||||
cd $dir_scripts
|
||||
define_program "$p1"
|
||||
. $file_task_before
|
||||
if [[ $p1 == *.js ]]; then
|
||||
if [[ $# -eq 1 ]]; then
|
||||
random_delay
|
||||
@@ -88,13 +87,16 @@ run_normal() {
|
||||
log_path="$log_dir/$log_time.log"
|
||||
make_dir "$log_dir"
|
||||
|
||||
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|" | head -1 | awk -F " " '{print $1}')
|
||||
local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
|
||||
echo -e "## 开始执行... $begin_time\n" | tee -a $log_path
|
||||
[[ $id ]] && update_cron_status "\"$id\"" "0"
|
||||
[[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path"
|
||||
. $file_task_before
|
||||
|
||||
timeout $command_timeout_time $which_program $p1 2>&1 | tee -a $log_path
|
||||
|
||||
. $file_task_after
|
||||
[[ $id ]] && update_cron_status "\"$id\"" "1"
|
||||
[[ $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")))
|
||||
echo -e "\n## 执行结束... $end_time 耗时 $diff_time 秒" | tee -a $log_path
|
||||
@@ -113,25 +115,54 @@ run_concurrent() {
|
||||
local array=($(echo $envs | sed 's/&/ /g'))
|
||||
cd $dir_scripts
|
||||
define_program "$p1"
|
||||
log_time=$(date "+%Y-%m-%d-%H-%M-%S")
|
||||
log_dir_tmp="${p1##*/}"
|
||||
log_dir="$dir_log/${log_dir_tmp%%.*}"
|
||||
log_path="$log_dir/$log_time.log"
|
||||
make_dir $log_dir
|
||||
log_time=$(date "+%Y-%m-%d-%H-%M-%S.%N")
|
||||
echo -e "\n各账号间已经在后台开始并发执行，前台不输入日志，日志直接写入文件中。\n"
|
||||
|
||||
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" | tee -a $log_path
|
||||
[[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path"
|
||||
. $file_task_before
|
||||
echo -e "\n各账号间已经在后台开始并发执行，前台不输入日志，日志直接写入文件中。\n" | tee -a $log_path
|
||||
|
||||
single_log_time=$(date "+%Y-%m-%d-%H-%M-%S.%N")
|
||||
for i in "${!array[@]}"; do
|
||||
export ${p3}=${array[i]}
|
||||
log_path="$log_dir/${log_time}_$((i+1)).log"
|
||||
timeout $command_timeout_time $which_program $p1 &>$log_path &
|
||||
single_log_path="$log_dir/${single_log_time}_$((i+1)).log"
|
||||
timeout $command_timeout_time $which_program $p1 &>$single_log_path &
|
||||
done
|
||||
|
||||
. $file_task_after
|
||||
[[ $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")))
|
||||
echo -e "\n## 执行结束... $end_time 耗时 $diff_time 秒" | tee -a $log_path
|
||||
}
|
||||
|
||||
## 运行其他命令
|
||||
run_else() {
|
||||
local log_time=$(date "+%Y-%m-%d-%H-%M-%S")
|
||||
local log_dir="$dir_log/$1"
|
||||
local log_path="$log_dir/$log_time.log"
|
||||
local log_dir_tmp="${1##*/}"
|
||||
local log_dir="$dir_log/${log_dir_tmp%%.*}"
|
||||
log_path="$log_dir/$log_time.log"
|
||||
make_dir "$log_dir"
|
||||
timeout $command_timeout_time "$@" 2>&1 | tee $log_path
|
||||
|
||||
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" | tee -a $log_path
|
||||
[[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path"
|
||||
. $file_task_before
|
||||
|
||||
timeout $command_timeout_time "$@" 2>&1 | tee -a $log_path
|
||||
|
||||
. $file_task_after
|
||||
[[ $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")))
|
||||
echo -e "\n## 执行结束... $end_time 耗时 $diff_time 秒" | tee -a $log_path
|
||||
}
|
||||
|
||||
## 命令检测
|
||||
|
||||
+3
-3
@@ -72,7 +72,7 @@ del_cron() {
|
||||
local ids=""
|
||||
echo -e "开始尝试自动删除失效的定时任务...\n"
|
||||
for cron in $(cat $list_drop); do
|
||||
local id=$(cat $list_crontab_user | grep -E "$cmd_task $cron" | perl -pe "s|.*ID=(.*) $cmd_task $cron|\1|" | xargs | sed 's/ /","/g' | head -1)
|
||||
local id=$(cat $list_crontab_user | grep -E "$cmd_task $cron" | perl -pe "s|.*ID=(.*) $cmd_task $cron\.*|\1|" | head -1 | head -1 | awk -F " " '{print $1}')
|
||||
if [[ $ids ]]; then
|
||||
ids="$ids,\"$id\""
|
||||
else
|
||||
@@ -179,7 +179,7 @@ update_raw() {
|
||||
echo -e "下载 ${raw_file_name} 成功...\n"
|
||||
cd $dir_raw
|
||||
local filename="raw_${raw_file_name}"
|
||||
local cron_id=$(cat $list_crontab_user | grep -E "$cmd_task $filename" | perl -pe "s|.*ID=(.*) $cmd_task $filename\.*|\1|" | head -1)
|
||||
local cron_id=$(cat $list_crontab_user | grep -E "$cmd_task $filename" | perl -pe "s|.*ID=(.*) $cmd_task $filename\.*|\1|" | head -1 | head -1 | awk -F " " '{print $1}')
|
||||
cp -f $raw_file_name $dir_scripts/${filename}
|
||||
cron_line=$(
|
||||
perl -ne "{
|
||||
@@ -376,7 +376,7 @@ gen_list_repo() {
|
||||
filename=$(basename $file)
|
||||
cp -f $file $dir_scripts/${repo}_${filename}
|
||||
echo ${repo}_${filename} >>"$dir_list_tmp/${repo}_scripts.list"
|
||||
cron_id=$(cat $list_crontab_user | grep -E "$cmd_task ${author}_${filename}" | perl -pe "s|.*ID=(.*) $cmd_task ${author}_${filename}\.*|\1|" | head -1)
|
||||
cron_id=$(cat $list_crontab_user | grep -E "$cmd_task ${author}_${filename}" | perl -pe "s|.*ID=(.*) $cmd_task ${author}_${filename}\.*|\1|" | head -1 | awk -F " " '{print $1}')
|
||||
if [[ $cron_id ]]; then
|
||||
result=$(update_cron_command_api "$cmd_task ${repo}_${filename}:$cron_id")
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user