Projects/lumberjack
1
0
Fork 0
Code Releases Wiki Activity

Exit when read returns 1 and reading from stdin

Browse source
This commit is contained in:
Darren 'Tadgy' Austin 2018-04-21 19:46:14 +01:00
commit 8ada5bc4a6
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lumberjack
View file

@ -8,7 +8,7 @@
# Script details. # Script details.
LJ_NAME="${0##*/}" LJ_NAME="${0##*/}"
LJ_VERSION="0.1.4" LJ_VERSION="0.1.5"
die() { die() {
@ -18,7 +18,7 @@ die() {
} }
display_help() { display_help() {
# |--------1---------2---------3---------4---------5---------6---------7---------8 # |........1.........2.........3.........4.........5.........6.........7.........8
cat <<-EOF cat <<-EOF
Usage: $LJ_NAME [options] <basedir> <template> Usage: $LJ_NAME [options] <basedir> <template>
Process input (possibly including an httpd VirtualHost site identifier) from Process input (possibly including an httpd VirtualHost site identifier) from
@ -86,7 +86,7 @@ EOF
} }
display_version() { display_version() {
# |--------1---------2---------3---------4---------5---------6---------7---------8 # |........1.........2.........3.........4.........5.........6.........7.........8
cat <<-EOF cat <<-EOF
$LJ_NAME v$LJ_VERSION. $LJ_NAME v$LJ_VERSION.
Copyright (c) 2018 Darren 'Tadgy' Austin <darren (at) afterdark.org.uk>. Copyright (c) 2018 Darren 'Tadgy' Austin <darren (at) afterdark.org.uk>.
@ -150,7 +150,7 @@ sigchld_handler() {
} }
sigterm_handler() { sigterm_handler() {
local LJ_SITE local LJ_SITE LJ_JOB
for LJ_SITE in "${!LJ_FDS[@]}"; do for LJ_SITE in "${!LJ_FDS[@]}"; do
{ exec {LJ_FDS[$LJ_SITE]}>&-; } 2>/dev/null { exec {LJ_FDS[$LJ_SITE]}>&-; } 2>/dev/null
done done
@ -342,10 +342,15 @@ while :; do
# Read the log line. # Read the log line.
# Note: The $(...) expansion should *not* be quoted in this instance. # Note: The $(...) expansion should *not* be quoted in this instance.
read -r -t "$LJ_TTNM" $((( LJ_RAW == 0 )) && printf "%s" "LJ_LOG_VHOST") LJ_LOG_DATA <"$LJ_INPUT" read -r -t "$LJ_TTNM" $((( LJ_RAW == 0 )) && printf "%s" "LJ_LOG_VHOST") LJ_LOG_DATA <"$LJ_INPUT"
LJ_ERR=$? LJ_ERR="$?"
if (( LJ_ERR > 128 )); then if (( LJ_ERR > 128 )); then
# If 'read' timed out, set a marker. # If 'read' timed out, set a marker.
LJ_TIMED_OUT=1 LJ_TIMED_OUT=1
elif (( LJ_ERR == 1 )); then
[[ "$LJ_INPUT" == "/dev/stdin" ]] && {
# stdin has been closed by the parent, quit gracefully by raising a SIGTERM.
kill -TERM "$$"
}
elif (( LJ_ERR != 0 )); then elif (( LJ_ERR != 0 )); then
# Unhandled error - sleep for a second and try again. # Unhandled error - sleep for a second and try again.
syslog "error" "unhandled return code from 'read': $LJ_ERR" syslog "error" "unhandled return code from 'read': $LJ_ERR"