mirror of
https://github.com/juewuy/ShellCrash.git
synced 2026-03-12 08:21:40 +00:00
~优化定时任务日志记录
This commit is contained in:
@@ -1,14 +1,15 @@
|
|||||||
#日志工具
|
#日志工具
|
||||||
. "$CRASHDIR"/libs/web_json.sh
|
. "$CRASHDIR"/libs/web_json.sh
|
||||||
#$1日志内容$2显示颜色$3是否推送
|
#$1日志内容$2显示颜色$3是否推送$4是否覆盖上一条
|
||||||
logger() {
|
logger() {
|
||||||
TMPDIR=/tmp/ShellCrash
|
TMPDIR=/tmp/ShellCrash
|
||||||
[ -n "$2" -a "$2" != 0 ] && printf "\033[%sm%s\033[0m\n" "$2" "$1"
|
[ -n "$2" -a "$2" != 0 ] && printf "\033[%sm%s\033[0m\n" "$2" "$1"
|
||||||
log_text="$(date "+%G-%m-%d_%H:%M:%S")~$1"
|
log_text="$(date "+%G-%m-%d_%H:%M:%S")~$1"
|
||||||
|
[ "$4" = on ] && sed -i "/$1/d" "$TMPDIR"/ShellCrash.log
|
||||||
echo "$log_text" >>"$TMPDIR"/ShellCrash.log
|
echo "$log_text" >>"$TMPDIR"/ShellCrash.log
|
||||||
[ "$(wc -l "$TMPDIR"/ShellCrash.log | awk '{print $1}')" -gt 199 ] && sed -i '1,20d' "$TMPDIR"/ShellCrash.log
|
[ "$(wc -l "$TMPDIR"/ShellCrash.log | awk '{print $1}')" -gt 199 ] && sed -i '1,20d' "$TMPDIR"/ShellCrash.log
|
||||||
#推送远程日志
|
#推送远程日志
|
||||||
[ -z "$3" ] && {
|
[ "$3" != off ] && {
|
||||||
[ -n "$device_name" ] && log_text="$log_text($device_name)"
|
[ -n "$device_name" ] && log_text="$log_text($device_name)"
|
||||||
[ -n "$push_TG" ] && {
|
[ -n "$push_TG" ] && {
|
||||||
url="https://api.telegram.org/bot${push_TG}/sendMessage"
|
url="https://api.telegram.org/bot${push_TG}/sendMessage"
|
||||||
|
|||||||
@@ -14,7 +14,11 @@ task_logger(){
|
|||||||
[ "$task_push" = 1 ] && push= || push=off
|
[ "$task_push" = 1 ] && push= || push=off
|
||||||
[ -n "$2" -a "$2" != 0 ] && echo -e "\033[$2m$1\033[0m"
|
[ -n "$2" -a "$2" != 0 ] && echo -e "\033[$2m$1\033[0m"
|
||||||
[ "$3" = 'off' ] && push=off
|
[ "$3" = 'off' ] && push=off
|
||||||
echo "$1" |grep -qE '(每隔|时每)([1-9]|[1-9][0-9])分钟' || logger "$1" 0 "$push"
|
echo "$1" |grep -qE '(每隔|时每)([1-9]|[1-9][0-9])分钟' && {
|
||||||
|
push=off
|
||||||
|
cover=on
|
||||||
|
}
|
||||||
|
logger "$1" 0 "$push" "$cover"
|
||||||
}
|
}
|
||||||
|
|
||||||
#任务命令
|
#任务命令
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ get_core_config() { #下载内核配置文件
|
|||||||
exit 1
|
exit 1
|
||||||
else
|
else
|
||||||
retry=$((retry + 1))
|
retry=$((retry + 1))
|
||||||
logger "配置文件获取失败!" 31
|
logger "配置文件获取失败!" 31 off on
|
||||||
if [ "$retry" = 1 ]; then
|
if [ "$retry" = 1 ]; then
|
||||||
echo -e "\033[32m尝试更新服务器列表并使用其他服务器获取配置!\033[0m"
|
echo -e "\033[32m尝试更新服务器列表并使用其他服务器获取配置!\033[0m"
|
||||||
update_servers
|
update_servers
|
||||||
|
|||||||
Reference in New Issue
Block a user