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

更改日志文件命名方式: 使用最后一个 . 之前的字符串作为日志名

Browse Source
This commit is contained in:
chen_10 2022-03-23 10:37:00 +08:00
parent 5a24f62a62
commit 2b867125b1
1 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
shell/task.sh
View File

@ -68,6 +68,17 @@ usage() {
fi fi
} }
get_log_path() {
local first_param=$1
local log_time=$(date "+%Y-%m-%d-%H-%M-%S")
local log_dir_tmp="${first_param##*/}"
local log_dir_tmp_path="${first_param%%/*}"
log_dir_tmp_path="${log_dir_tmp_path##*/}"
[[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
log_dir="$dir_log/${log_dir_tmp%.*}"
log_path="$log_dir/$log_time.log"
}
## run nohup，$1：文件名，不含路径，带后缀 ## run nohup，$1：文件名，不含路径，带后缀
run_nohup() { run_nohup() {
local file_name=$1 local file_name=$1
@ -84,13 +95,7 @@ run_normal() {
fi fi
fi fi
log_time=$(date "+%Y-%m-%d-%H-%M-%S") get_log_path "$first_param"
log_dir_tmp="${first_param##*/}"
log_dir_tmp_path="${first_param%%/*}"
log_dir_tmp_path="${log_dir_tmp_path##*/}"
[[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
log_dir="$dir_log/${log_dir_tmp%%.*}"
log_path="$log_dir/$log_time.log"
cmd="&>> $log_path" cmd="&>> $log_path"
[[ "$show_log" == "true" ]] && cmd="" [[ "$show_log" == "true" ]] && cmd=""
make_dir "$log_dir" make_dir "$log_dir"
@ -146,13 +151,7 @@ run_concurrent() {
[[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr} [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
define_program "$first_param" define_program "$first_param"
log_time=$(date "+%Y-%m-%d-%H-%M-%S") get_log_path "$first_param"
log_dir_tmp="${first_param##*/}"
log_dir_tmp_path="${first_param%%/*}"
log_dir_tmp_path="${log_dir_tmp_path##*/}"
[[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
log_dir="$dir_log/${log_dir_tmp%%.*}"
log_path="$log_dir/$log_time.log"
cmd="&>> $log_path" cmd="&>> $log_path"
[[ "$show_log" == "true" ]] && cmd="" [[ "$show_log" == "true" ]] && cmd=""
make_dir $log_dir make_dir $log_dir
@ -208,13 +207,7 @@ run_designated() {
fi fi
define_program "$file_param" define_program "$file_param"
log_time=$(date "+%Y-%m-%d-%H-%M-%S") get_log_path "$file_param"
log_dir_tmp="${file_param##*/}"
log_dir_tmp_path="${file_param%%/*}"
log_dir_tmp_path="${log_dir_tmp_path##*/}"
[[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
log_dir="$dir_log/${log_dir_tmp%%.*}"
log_path="$log_dir/$log_time.log"
cmd="&>> $log_path" cmd="&>> $log_path"
[[ "$show_log" == "true" ]] && cmd="" [[ "$show_log" == "true" ]] && cmd=""
make_dir $log_dir make_dir $log_dir
@ -264,13 +257,7 @@ run_designated() {
run_else() { run_else() {
local file_param="$1" local file_param="$1"
define_program "$file_param" define_program "$file_param"
log_time=$(date "+%Y-%m-%d-%H-%M-%S") get_log_path "$file_param"
log_dir_tmp="${file_param##*/}"
log_dir_tmp_path="${file_param%%/*}"
log_dir_tmp_path="${log_dir_tmp_path##*/}"
[[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
log_dir="$dir_log/${log_dir_tmp%%.*}"
log_path="$log_dir/$log_time.log"
cmd="&>> $log_path" cmd="&>> $log_path"
[[ "$show_log" == "true" ]] && cmd="" [[ "$show_log" == "true" ]] && cmd=""
make_dir $log_dir make_dir $log_dir