More logging cleanup

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5114 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-12-12 17:49:52 +00:00
parent 2e9eed3dfe
commit 837f977d6d
5 changed files with 19 additions and 25 deletions

View File

@ -188,11 +188,11 @@ start_command() {
rc=$? rc=$?
else else
error_message "${LITEDIR}/firewall is missing or is not executable" error_message "${LITEDIR}/firewall is missing or is not executable"
logger -p kern.err "ERROR:Shorewall Lite start failed"
rc=2 rc=2
fi fi
[ -n "$nolock" ] || mutex_off [ -n "$nolock" ] || mutex_off
[ $rc -eq 0 ] || logger "ERROR:Shorewall Lite start failed"
exit $rc exit $rc
} }
@ -363,11 +363,11 @@ restart_command() {
rc=$? rc=$?
else else
error_message "${LITEDIR}/firewall is missing or is not executable" error_message "${LITEDIR}/firewall is missing or is not executable"
logger -p kern.err "ERROR:Shorewall Lite restart failed"
rc=2 rc=2
fi fi
[ -n "$nolock" ] || mutex_off [ -n "$nolock" ] || mutex_off
[ $rc -eq 0 ] || logger "ERROR:Shorewall Lite restart failed"
return $rc return $rc
} }

View File

@ -4462,13 +4462,13 @@ stop_firewall() {
case \$COMMAND in case \$COMMAND in
start) start)
logger "Shorewall start failed" logger -p kern.err "ERROR:\$PRODUCT start failed"
;; ;;
restart) restart)
logger "Shorewall restart failed" logger -p kern.err "ERROR:\$PRODUCT restart failed"
;; ;;
restore) restore)
logger "Shorewall restore failed" logger -p kern.err "ERROR:\$PRODUCT restore failed"
;; ;;
esac esac
@ -4691,7 +4691,7 @@ __EOF__
set_state "Stopped" set_state "Stopped"
logger "Shorewall Stopped" logger -p kern.info "\$PRODUCT Stopped"
case \$COMMAND in case \$COMMAND in
stop|clear) stop|clear)
@ -4887,7 +4887,7 @@ __EOF__
set_state "Cleared" set_state "Cleared"
logger "\$PRODUCT Cleared" logger -p kern.info "\$PRODUCT Cleared"
} }
# #
@ -4908,13 +4908,13 @@ startup_error() # \$* = Error Message
echo " ERROR: \$@" >&2 echo " ERROR: \$@" >&2
case \$COMMAND in case \$COMMAND in
start) start)
logger "Shorewall start failed" logger -p kern.err "ERROR:\$PRODUCT start failed"
;; ;;
restart) restart)
logger "Shorewall restart failed" logger -p kern.err "ERROR:\$PRODUCT restart failed"
;; ;;
restore) restore)
logger "Shorewall restore failed" logger -p kern.err "ERROR:\$PRODUCT restore failed"
;; ;;
esac esac
@ -5480,13 +5480,13 @@ __EOF__
case \$COMMAND in case \$COMMAND in
start) start)
logger "Shorewall started" logger -p kern.info "\$PRODUCT started"
;; ;;
restart) restart)
logger "Shorewall restarted" logger -p kern.info "\$PRODUCT restarted"
;; ;;
restore) restore)
logger "Shorewall restored" logger -p kern.info "\$PRODUCT restored"
;; ;;
esac esac

View File

@ -81,7 +81,7 @@ startup_error() # $* = Error Message
# #
report () { # $* = message report () { # $* = message
progress_message3 "$@" progress_message3 "$@"
logger "$@" logger -p kern.info "$@"
} }
# #
@ -391,7 +391,7 @@ stop_firewall() {
set_state "Stopped" set_state "Stopped"
logger "Shorewall Stopped" logger -p kern.info "Shorewall Stopped"
rm -rf $TMP_DIR rm -rf $TMP_DIR
@ -434,7 +434,7 @@ clear_firewall() {
set_state "Cleared" set_state "Cleared"
logger "Shorewall Cleared" logger -p kern.info "Shorewall Cleared"
} }
# #

View File

@ -766,12 +766,7 @@ restore_command() {
progress_message3 "Restoring Shorewall..." progress_message3 "Restoring Shorewall..."
if $SHOREWALL_SHELL $RESTOREPATH restore; then $SHOREWALL_SHELL $RESTOREPATH restore && progress_message3 "$PRODUCT restored from ${VARDIR}/$RESTOREFILE"
progress_message3 "$PRODUCT restored from ${VARDIR}/$RESTOREFILE"
logger "$PRODUCT restored"
else
logger "ERROR:$PRODUCT restore failed"
fi
[ -n "$nolock" ] || mutex_off [ -n "$nolock" ] || mutex_off
else else

View File

@ -233,11 +233,11 @@ start_command() {
${VARDIR}/.start $debugging start ${VARDIR}/.start $debugging start
rc=$? rc=$?
else else
logger -p kern.err "ERROR:Shorewall start failed"
rc=$? rc=$?
fi fi
[ -n "$nolock" ] || mutex_off [ -n "$nolock" ] || mutex_off
[ $rc -ne 0 ] && logger "ERROR: Shorewall start failed"
exit $rc exit $rc
} }
@ -332,7 +332,6 @@ start_command() {
$SHOREWALL_SHELL $RESTOREPATH restore $SHOREWALL_SHELL $RESTOREPATH restore
date > ${VARDIR}/restarted date > ${VARDIR}/restarted
progress_message3 Shorewall restored from $RESTOREPATH progress_message3 Shorewall restored from $RESTOREPATH
logger "Shorewall restored"
else else
do_it do_it
fi fi
@ -551,11 +550,11 @@ restart_command() {
$SHOREWALL_SHELL ${VARDIR}/.restart $debugging restart $SHOREWALL_SHELL ${VARDIR}/.restart $debugging restart
rc=$? rc=$?
else else
logger -p kern.err "ERROR:Shorewall restart failed"
rc=$? rc=$?
fi fi
[ -n "$nolock" ] || mutex_off [ -n "$nolock" ] || mutex_off
[ $rc -ne 0 ] && logger "ERROR: Shorewall restart failed"
return $rc return $rc
} }