sequencer - fix sqr::log output not seen in additinal pipe output
This commit is contained in:
21
sequencer.sh
21
sequencer.sh
@@ -411,7 +411,7 @@ USAGE_API
|
|||||||
local newline='\n'
|
local newline='\n'
|
||||||
local col_end=
|
local col_end=
|
||||||
col_end="$(col off)"
|
col_end="$(col off)"
|
||||||
local outp='/dev/stdout'
|
local outerr=0
|
||||||
|
|
||||||
local log_level="${1:-}"
|
local log_level="${1:-}"
|
||||||
shift
|
shift
|
||||||
@@ -428,7 +428,8 @@ USAGE_API
|
|||||||
case "${arg}" in
|
case "${arg}" in
|
||||||
a) appendText=1 ;;
|
a) appendText=1 ;;
|
||||||
d) direct=1 ;;
|
d) direct=1 ;;
|
||||||
e) outp='/dev/stderr' ;;
|
e) outerr=1
|
||||||
|
exec 8>&1 9>&2 >&2;;
|
||||||
n) newline='' ;;
|
n) newline='' ;;
|
||||||
*) ;;
|
*) ;;
|
||||||
esac
|
esac
|
||||||
@@ -441,30 +442,32 @@ USAGE_API
|
|||||||
local log_line=""
|
local log_line=""
|
||||||
|
|
||||||
while IFS=$'\n' read -r log_line ; do
|
while IFS=$'\n' read -r log_line ; do
|
||||||
printf '%b' "${log_color}" >${outp}
|
printf '%b' "${log_color}"
|
||||||
if ! (( direct )) ; then
|
if ! (( direct )) ; then
|
||||||
if [[ -n "${LOG_TIME}" ]] ; then
|
if [[ -n "${LOG_TIME}" ]] ; then
|
||||||
if (( appendText )) ; then
|
if (( appendText )) ; then
|
||||||
printf '%19s' "" >${outp}
|
printf '%19s' ""
|
||||||
else
|
else
|
||||||
printf '%s' "$(date +"%Y-%m-%d %H:%M:%S")" >${outp}
|
printf '%s' "$(date +"%Y-%m-%d %H:%M:%S")"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if (( ! appendText )) ; then
|
if (( ! appendText )) ; then
|
||||||
printf " %3s " "[${log_level}]" >${outp}
|
printf " %3s " "[${log_level}]"
|
||||||
printf "%s" "${log_line}" >${outp}
|
printf "%s" "${log_line}"
|
||||||
else
|
else
|
||||||
# +4 : " [] "
|
# +4 : " [] "
|
||||||
printf "%$((${#log_level} + 4))s%s" "" "${log_line}" >${outp}
|
printf "%$((${#log_level} + 4))s%s" "" "${log_line}"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
# direct output
|
# direct output
|
||||||
printf '%s' "${log_line}"
|
printf '%s' "${log_line}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
printf '%b'"${newline}" "${col_end}" >${outp}
|
printf '%b'"${newline}" "${col_end}"
|
||||||
done <<< "${@:-}"
|
done <<< "${@:-}"
|
||||||
|
(( outerr )) && exec 1>&8 2>&9
|
||||||
|
return 0
|
||||||
sqr::debugContinue
|
sqr::debugContinue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user