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

修复shell获取时间

Browse Source
This commit is contained in:
whyour 2022-07-17 13:24:59 +08:00
parent 9f0503f138
commit f016e6734a
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
shell/share.sh
View File

@ -401,6 +401,17 @@ format_time() {
fi fi
} }
format_log_time() {
local format="$1"
local time="$2"
if [[ $is_macos -eq 1 ]]; then
echo $(date -j -f "$format" "$time" "+%Y-%m-%d-%H-%M-%S")
else
echo $(date -d "$time" "+%Y-%m-%d-%H-%M-%S")
fi
}
format_timestamp() { format_timestamp() {
local format="$1" local format="$1"
local time="$2" local time="$2"

34
shell/task.sh
View File

@ -84,8 +84,8 @@ run_normal() {
fi fi
fi fi
local time=$(date "+%Y-%m-%d-%H-%M-%S") local time=$(date "+$time_format")
log_time="$time" log_time=$(format_log_time "$time_format" "$time")
log_dir_tmp="${file_param##*/}" log_dir_tmp="${file_param##*/}"
if [[ $file_param =~ "/" ]]; then if [[ $file_param =~ "/" ]]; then
if [[ $file_param == /* ]]; then if [[ $file_param == /* ]]; then
@ -103,8 +103,9 @@ run_normal() {
[[ "$show_log" == "true" ]] && cmd="" [[ "$show_log" == "true" ]] && cmd=""
make_dir "$dir_log/$log_dir" make_dir "$dir_log/$log_dir"
local begin_time=$(format_time "%Y-%m-%d-%H-%M-%S" "$time") local begin_time=$(format_time "$time_format" "$time")
local begin_timestamp=$(format_timestamp "%Y-%m-%d-%H-%M-%S" "$time") local begin_timestamp=$(format_timestamp "$time_format" "$time")
eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
[[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
@ -155,8 +156,8 @@ run_concurrent() {
[[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr} [[ ! -z $cookieStr ]] && export ${env_param}=${cookieStr}
define_program "$file_param" define_program "$file_param"
local time=$(date "+%Y-%m-%d-%H-%M-%S") local time=$(date "+$time_format")
log_time="$time" log_time=$(format_log_time "$time_format" "$time")
log_dir_tmp="${file_param##*/}" log_dir_tmp="${file_param##*/}"
if [[ $file_param =~ "/" ]]; then if [[ $file_param =~ "/" ]]; then
if [[ $file_param == /* ]]; then if [[ $file_param == /* ]]; then
@ -174,8 +175,8 @@ run_concurrent() {
[[ "$show_log" == "true" ]] && cmd="" [[ "$show_log" == "true" ]] && cmd=""
make_dir "$dir_log/$log_dir" make_dir "$dir_log/$log_dir"
local begin_time=$(format_time "%Y-%m-%d-%H-%M-%S" "$time") local begin_time=$(format_time "$time_format" "$time")
local begin_timestamp=$(format_timestamp "%Y-%m-%d-%H-%M-%S" "$time") local begin_timestamp=$(format_timestamp "$time_format" "$time")
eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
[[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
@ -225,8 +226,8 @@ run_designated() {
fi fi
define_program "$file_param" define_program "$file_param"
local time=$(date "+%Y-%m-%d-%H-%M-%S") local time=$(date "+$time_format")
log_time="$time" log_time=$(format_log_time "$time_format" "$time")
log_dir_tmp="${file_param##*/}" log_dir_tmp="${file_param##*/}"
if [[ $file_param =~ "/" ]]; then if [[ $file_param =~ "/" ]]; then
if [[ $file_param == /* ]]; then if [[ $file_param == /* ]]; then
@ -244,8 +245,8 @@ run_designated() {
[[ "$show_log" == "true" ]] && cmd="" [[ "$show_log" == "true" ]] && cmd=""
make_dir "$dir_log/$log_dir" make_dir "$dir_log/$log_dir"
local begin_time=$(format_time "%Y-%m-%d-%H-%M-%S" "$time") local begin_time=$(format_time "$time_format" "$time")
local begin_timestamp=$(format_timestamp "%Y-%m-%d-%H-%M-%S" "$time") local begin_timestamp=$(format_timestamp "$time_format" "$time")
local envs=$(eval echo "\$${env_param}") local envs=$(eval echo "\$${env_param}")
local array=($(echo $envs | sed 's/&/ /g')) local array=($(echo $envs | sed 's/&/ /g'))
@ -289,8 +290,8 @@ run_designated() {
run_else() { run_else() {
local file_param="$1" local file_param="$1"
define_program "$file_param" define_program "$file_param"
local time=$(date "+%Y-%m-%d-%H-%M-%S") local time=$(date "+$time_format")
log_time="$time" log_time=$(format_log_time "$time_format" "$time")
log_dir_tmp="${file_param##*/}" log_dir_tmp="${file_param##*/}"
if [[ $file_param =~ "/" ]]; then if [[ $file_param =~ "/" ]]; then
if [[ $file_param == /* ]]; then if [[ $file_param == /* ]]; then
@ -308,8 +309,8 @@ run_else() {
[[ "$show_log" == "true" ]] && cmd="" [[ "$show_log" == "true" ]] && cmd=""
make_dir "$dir_log/$log_dir" make_dir "$dir_log/$log_dir"
local begin_time=$(format_time "%Y-%m-%d-%H-%M-%S" "$time") local begin_time=$(format_time "$time_format" "$time")
local begin_timestamp=$(format_timestamp "%Y-%m-%d-%H-%M-%S" "$time") local begin_timestamp=$(format_timestamp "$time_format" "$time")
eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
[[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd [[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
@ -354,6 +355,7 @@ main() {
timeoutCmd="timeout -k 10s $command_timeout_time " timeoutCmd="timeout -k 10s $command_timeout_time "
fi fi
time_format="%Y-%m-%d %H:%M:%S"
if [[ $1 == *.js ]] || [[ $1 == *.py ]] || [[ $1 == *.sh ]] || [[ $1 == *.ts ]]; then if [[ $1 == *.js ]] || [[ $1 == *.py ]] || [[ $1 == *.sh ]] || [[ $1 == *.ts ]]; then
case $# in case $# in
1) 1)