mirror of
				https://github.com/whyour/qinglong.git
				synced 2025-11-04 02:56:07 +08:00 
			
		
		
		
	修改 ql 命令打印日志逻辑
This commit is contained in:
		
							parent
							
								
									3756fa93e4
								
							
						
					
					
						commit
						444836975d
					
				| 
						 | 
					@ -432,14 +432,25 @@ main() {
 | 
				
			||||||
  local p5=$5
 | 
					  local p5=$5
 | 
				
			||||||
  local p6=$6
 | 
					  local p6=$6
 | 
				
			||||||
  local p7=$7
 | 
					  local p7=$7
 | 
				
			||||||
 | 
					  local log_dir="${dir_log}/${p1}"
 | 
				
			||||||
 | 
					  make_dir "${log_dir}"
 | 
				
			||||||
  local log_time=$(date "+%Y-%m-%d-%H-%M-%S")
 | 
					  local log_time=$(date "+%Y-%m-%d-%H-%M-%S")
 | 
				
			||||||
  local log_path="$dir_log/update/$p1_${log_time}.log"
 | 
					  local log_path="${log_dir}/${log_time}.log"
 | 
				
			||||||
  local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  cmd=">> $log_path 2>&1"
 | 
					  cmd=">> $log_path 2>&1"
 | 
				
			||||||
  [[ "$show_log" == "true" ]] && cmd=""
 | 
					  [[ "$show_log" == "true" ]] && cmd=""
 | 
				
			||||||
  [[ -f $task_error_log_path ]] && cat $task_error_log_path $cmd
 | 
					  [[ -f $task_error_log_path ]] && cat $task_error_log_path $cmd
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  if [[ "$show_log" == "true" ]] && [[ $ID ]]; then
 | 
				
			||||||
 | 
					    eval echo -e "请移除 -l 参数" $cmd
 | 
				
			||||||
 | 
					    exit 1
 | 
				
			||||||
 | 
					  fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  local time_format="%Y-%m-%d %H:%M:%S"
 | 
				
			||||||
 | 
					  local time=$(date "+$time_format")
 | 
				
			||||||
 | 
					  local begin_timestamp=$(format_timestamp "$time_format" "$time")
 | 
				
			||||||
 | 
					  [[ $ID ]] && update_cron "\"$ID\"" "0" "$$" "$log_path" "$begin_timestamp"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  case $p1 in
 | 
					  case $p1 in
 | 
				
			||||||
  update)
 | 
					  update)
 | 
				
			||||||
    eval update_qinglong "$2" $cmd
 | 
					    eval update_qinglong "$2" $cmd
 | 
				
			||||||
| 
						 | 
					@ -489,8 +500,12 @@ main() {
 | 
				
			||||||
    usage
 | 
					    usage
 | 
				
			||||||
    ;;
 | 
					    ;;
 | 
				
			||||||
  esac
 | 
					  esac
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  if [[ -f $log_path ]]; then
 | 
					  if [[ -f $log_path ]]; then
 | 
				
			||||||
    cat $log_path
 | 
					    cat $log_path
 | 
				
			||||||
 | 
					    local end_timestamp=$(date "+%s")
 | 
				
			||||||
 | 
					    local diff_time=$(($end_timestamp - $begin_timestamp))
 | 
				
			||||||
 | 
					    [[ $ID ]] && update_cron "\"$ID\"" "1" "" "$log_path" "$begin_timestamp" "$diff_time"
 | 
				
			||||||
  fi
 | 
					  fi
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user