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

更新版本v2.14.7

Browse Source
This commit is contained in:
whyour 2022-10-01 23:12:57 +08:00
parent 2db4f1ba87
commit 78f643c50f
2 changed files with 19 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
shell/task.sh
View File

@ -129,15 +129,8 @@ check_server() {
# eval echo -e "\#\# 当前CPU占用 $cpu_use% 内存占用 $mem_use% 磁盘占用 $disk_use% \\\n" $cmd # eval echo -e "\#\# 当前CPU占用 $cpu_use% 内存占用 $mem_use% 磁盘占用 $disk_use% \\\n" $cmd
if [[ $cpu_use -gt $cpu_warn ]] || [[ $mem_free -lt $mem_warn ]] || [[ $disk_use -gt $disk_warn ]]; then if [[ $cpu_use -gt $cpu_warn ]] || [[ $mem_free -lt $mem_warn ]] || [[ $disk_use -gt $disk_warn ]]; then
# echo -e "\#\# 服务器资源占用异常，本次任务跳过执行" $cmd local resource = $(top -b -n 1 | grep -v -E 'grep|Mem|idle|Load' | awk '{$2="";$3="";$4="";$5="";$7="";print $0}' | head -n 10)
local resource = $(top -b -n 1 | grep -v -E 'grep|Mem|idle|Load' | awk '{$2="";$3="";$4="";$5="";$7="";print $0}' | head -n 10)
notify_api "服务器资源异常警告" "当前CPU占用 $cpu_use% 内存占用 $mem_use% 磁盘占用 $disk_use% \n资源占用详情 \n\n $resource" notify_api "服务器资源异常警告" "当前CPU占用 $cpu_use% 内存占用 $mem_use% 磁盘占用 $disk_use% \n资源占用详情 \n\n $resource"
# end_time=$(date '+%Y-%m-%d %H:%M:%S')
# diff_time=$(($end_timestamp - $begin_timestamp))
# [[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
# eval echo -e "\\\n\#\# 执行结束... $end_time 耗时 $diff_time 秒" $cmd
# exit 1
fi fi
} }
@ -157,6 +150,15 @@ handle_task_before() {
eval . $file_task_before "$@" $cmd eval . $file_task_before "$@" $cmd
} }
handle_task_after() {
eval . $file_task_after "$@" $cmd
local end_time=$(date '+%Y-%m-%d %H:%M:%S')
local end_timestamp=$(date "+%s")
local diff_time=$(($end_timestamp - $begin_timestamp))
[[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
eval echo -e "\\\n\#\# 执行结束... $end_time 耗时 $diff_time 秒" $cmd
}
## 正常运行单个脚本，$1：传入参数 ## 正常运行单个脚本，$1：传入参数
run_normal() { run_normal() {
local file_param=$1 local file_param=$1
@ -175,12 +177,7 @@ run_normal() {
eval $timeoutCmd $which_program $file_param $cmd eval $timeoutCmd $which_program $file_param $cmd
eval . $file_task_after "$@" $cmd handle_task_after "$@"
local end_time=$(date '+%Y-%m-%d %H:%M:%S')
local end_timestamp=$(date "+%s")
local diff_time=$(expr $end_timestamp - $begin_timestamp)
[[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
eval echo -e "\\\n\#\# 执行结束... $end_time 耗时 $diff_time 秒" $cmd
} }
## 并发执行时，设定的 RandomDelay 不会生效，即所有任务立即执行 ## 并发执行时，设定的 RandomDelay 不会生效，即所有任务立即执行
@ -233,12 +230,7 @@ run_concurrent() {
[[ -f $single_log_path ]] && rm -f $single_log_path [[ -f $single_log_path ]] && rm -f $single_log_path
done done
eval . $file_task_after "$@" $cmd handle_task_after "$@"
local end_time=$(date '+%Y-%m-%d %H:%M:%S')
local end_timestamp=$(date "+%s")
local diff_time=$(($end_timestamp - $begin_timestamp))
[[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
eval echo -e "\\\n\#\# 执行结束... $end_time 耗时 $diff_time 秒" $cmd
} }
run_designated() { run_designated() {
@ -275,12 +267,7 @@ run_designated() {
fi fi
eval $timeoutCmd $which_program $file_param $cmd eval $timeoutCmd $which_program $file_param $cmd
eval . $file_task_after "$@" $cmd handle_task_after "$@"
local end_time=$(date '+%Y-%m-%d %H:%M:%S')
local end_timestamp=$(date "+%s")
local diff_time=$(($end_timestamp - $begin_timestamp))
[[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
eval echo -e "\\\n\#\# 执行结束... $end_time 耗时 $diff_time 秒" $cmd
} }
## 运行其他命令 ## 运行其他命令
@ -299,12 +286,7 @@ run_else() {
shift shift
eval $timeoutCmd $which_program "$file_param" "$@" $cmd eval $timeoutCmd $which_program "$file_param" "$@" $cmd
eval . $file_task_after "$file_param" "$@" $cmd handle_task_after "$@"
local end_time=$(date '+%Y-%m-%d %H:%M:%S')
local end_timestamp=$(date "+%s")
local diff_time=$(($end_timestamp - $begin_timestamp))
[[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
eval echo -e "\\\n\#\# 执行结束... $end_time 耗时 $diff_time 秒" $cmd
} }
## 命令检测 ## 命令检测

12
src/version.ts
View File

@ -1,8 +1,6 @@
export const version = '2.14.6'; export const version = '2.14.7';
export const changeLogLink = 'https://t.me/jiao_long/333'; export const changeLogLink = 'https://t.me/jiao_long/334';
export const changeLog = `2.14.6 版本说明 export const changeLog = `2.14.7 版本说明
1. 任务执行日志增加资源占用说明 1. 修复task_before无法获取任务执行参数
2. 配置文件config.sh增加资源配置参数CpuWarn/MemoryWarn/DiskWarn 2. 修改资源判定逻辑
3. 修复脚本管理和日志管理搜索
4. 其他bug修复
`; `;