open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2026-06-30 20:35:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复未产生日志文件cat报错

Browse Source
This commit is contained in:
hanhh
2021-08-22 22:02:31 +08:00
parent b0f6bb3ea6
commit 5a5e81eae0
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shell/task.sh
+4 -4
View File
@@ -93,7 +93,7 @@ run_normal() {
local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
eval cat $task_error_log_path $cmd
[[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
local id=$(cat $list_crontab_user | grep -E "$cmd_task $first_param" | perl -pe "s|.*ID=(.*) $cmd_task $first_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
[[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path"
@@ -129,7 +129,7 @@ run_concurrent() {
local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
eval cat $task_error_log_path $cmd
[[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
local id=$(cat $list_crontab_user | grep -E "$cmd_task $first_param" | perl -pe "s|.*ID=(.*) $cmd_task $first_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
[[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path"
@@ -170,7 +170,7 @@ run_else() {
local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
eval cat $task_error_log_path $cmd
[[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
local id=$(cat $list_crontab_user | grep -E "$cmd_task $first_param" | perl -pe "s|.*ID=(.*) $cmd_task $first_param\.*|\1|" | head -1 | awk -F " " '{print $1}')
[[ $id ]] && update_cron "\"$id\"" "0" "$$" "$log_path"
@@ -220,7 +220,7 @@ main() {
run_else "$@"
;;
esac
cat $log_path
[[ -f $log_path ]] && cat $log_path
elif [[ $# -eq 0 ]]; then
echo
usage
shell/update.sh
+8 -8
View File
@@ -450,12 +450,12 @@ main() {
case $p1 in
update)
eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
eval cat $task_error_log_path $cmd
[[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
eval update_qinglong "$2" $cmd
;;
extra)
eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
eval cat $task_error_log_path $cmd
[[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
eval run_extra_shell $cmd
;;
repo)
@@ -465,7 +465,7 @@ main() {
[[ "$show_log" == "false" ]] && cmd=">> $log_path"
eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
cat $task_error_log_path $cmd
[[ -f $task_error_log_path ]] && cat $task_error_log_path $cmd
if [[ -n $p2 ]]; then
eval update_repo "$p2" "$p3" "$p4" "$p5" "$p6" $cmd
else
@@ -480,7 +480,7 @@ main() {
[[ "$show_log" == "false" ]] && cmd=">> $log_path"
eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
eval cat $task_error_log_path $cmd
[[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
if [[ -n $p2 ]]; then
eval update_raw "$p2" $cmd
else
@@ -490,17 +490,17 @@ main() {
;;
rmlog)
eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
eval cat $task_error_log_path $cmd
[[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
eval . $dir_shell/rmlog.sh "$p2" $cmd
;;
bot)
eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
eval cat $task_error_log_path $cmd
[[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
eval . $dir_shell/bot.sh $cmd
;;
check)
eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
eval cat $task_error_log_path $cmd
[[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
eval . $dir_shell/check.sh $cmd
;;
*)
@@ -511,7 +511,7 @@ main() {
local end_time=$(date '+%Y-%m-%d %H:%M:%S')
local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
eval echo -e "\\\n\#\# 执行结束... $end_time 耗时 $diff_time 秒" $cmd
cat $log_path
[[ -f $log_path ]] && cat $log_path
}
main "$@"