extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-20 17:58:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate LOG_VERBOSE

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-02-28 16:58:30 -08:00
parent fb55d63eaf
commit 39883aa690
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Shorewall/Perl/Shorewall/Compiler.pm
View File

@ -225,7 +225,6 @@ sub generate_script_2() {
'TERMINATOR=fatal_error' , 'TERMINATOR=fatal_error' ,
qq(DONT_LOAD="@dont_load") , qq(DONT_LOAD="@dont_load") ,
qq(STARTUP_LOG="$config{STARTUP_LOG}") , qq(STARTUP_LOG="$config{STARTUP_LOG}") ,
"LOG_VERBOSE=$config{LOG_VERBOSITY}" ,
'' ''
); );

10
Shorewall/Perl/prog.header
View File

@ -43,7 +43,7 @@ progress_message() # $* = Message
echo "${timestamp}$@" echo "${timestamp}$@"
fi fi
if [ $LOG_VERBOSE -gt 1 ]; then if [ $LOG_VERBOSITY -gt 1 ]; then
timestamp="$(date +'%b %_d %T') " timestamp="$(date +'%b %_d %T') "
echo "${timestamp}$@" >> $STARTUP_LOG echo "${timestamp}$@" >> $STARTUP_LOG
fi fi
@ -59,7 +59,7 @@ progress_message2() # $* = Message
echo "${timestamp}$@" echo "${timestamp}$@"
fi fi
if [ $LOG_VERBOSE -gt 0 ]; then if [ $LOG_VERBOSITY -gt 0 ]; then
timestamp="$(date +'%b %_d %T') " timestamp="$(date +'%b %_d %T') "
echo "${timestamp}$@" >> $STARTUP_LOG echo "${timestamp}$@" >> $STARTUP_LOG
fi fi
@ -75,7 +75,7 @@ progress_message3() # $* = Message
echo "${timestamp}$@" echo "${timestamp}$@"
fi fi
if [ $LOG_VERBOSE -ge 0 ]; then if [ $LOG_VERBOSITY -ge 0 ]; then
timestamp="$(date +'%b %_d %T') " timestamp="$(date +'%b %_d %T') "
echo "${timestamp}$@" >> $STARTUP_LOG echo "${timestamp}$@" >> $STARTUP_LOG
fi fi
@ -1124,7 +1124,7 @@ fatal_error()
{ {
echo " ERROR: $@" >&2 echo " ERROR: $@" >&2
if [ $LOG_VERBOSE -gt 1 ]; then if [ $LOG_VERBOSITY -gt 1 ]; then
timestamp="$(date +'%_b %d %T') " timestamp="$(date +'%_b %d %T') "
echo "${timestamp} ERROR: $@" >> $STARTUP_LOG echo "${timestamp} ERROR: $@" >> $STARTUP_LOG
fi fi
@ -1152,7 +1152,7 @@ startup_error() # $* = Error Message
;; ;;
esac esac
if [ $LOG_VERBOSE -gt 1 ]; then if [ $LOG_VERBOSITY -gt 1 ]; then
timestamp="$(date +'%_b %d %T') " timestamp="$(date +'%_b %d %T') "
case $COMMAND in case $COMMAND in

10
Shorewall/Perl/prog.header6
View File

@ -43,7 +43,7 @@ progress_message() # $* = Message
echo "${timestamp}$@" echo "${timestamp}$@"
fi fi
if [ $LOG_VERBOSE -gt 1 ]; then if [ $LOG_VERBOSITY -gt 1 ]; then
timestamp="$(date +'%b %_d %T') " timestamp="$(date +'%b %_d %T') "
echo "${timestamp}$@" >> $STARTUP_LOG echo "${timestamp}$@" >> $STARTUP_LOG
fi fi
@ -59,7 +59,7 @@ progress_message2() # $* = Message
echo "${timestamp}$@" echo "${timestamp}$@"
fi fi
if [ $LOG_VERBOSE -gt 0 ]; then if [ $LOG_VERBOSITY -gt 0 ]; then
timestamp="$(date +'%b %_d %T') " timestamp="$(date +'%b %_d %T') "
echo "${timestamp}$@" >> $STARTUP_LOG echo "${timestamp}$@" >> $STARTUP_LOG
fi fi
@ -75,7 +75,7 @@ progress_message3() # $* = Message
echo "${timestamp}$@" echo "${timestamp}$@"
fi fi
if [ $LOG_VERBOSE -ge 0 ]; then if [ $LOG_VERBOSITY -ge 0 ]; then
timestamp="$(date +'%b %_d %T') " timestamp="$(date +'%b %_d %T') "
echo "${timestamp}$@" >> $STARTUP_LOG echo "${timestamp}$@" >> $STARTUP_LOG
fi fi
@ -975,7 +975,7 @@ fatal_error()
{ {
echo " ERROR: $@" >&2 echo " ERROR: $@" >&2
if [ $LOG_VERBOSE -gt 1 ]; then if [ $LOG_VERBOSITY -gt 1 ]; then
timestamp="$(date +'%_b %d %T') " timestamp="$(date +'%_b %d %T') "
echo "${timestamp} ERROR: $@" >> $STARTUP_LOG echo "${timestamp} ERROR: $@" >> $STARTUP_LOG
fi fi
@ -1003,7 +1003,7 @@ startup_error() # $* = Error Message
;; ;;
esac esac
if [ $LOG_VERBOSE -gt 1 ]; then if [ $LOG_VERBOSITY -gt 1 ]; then
timestamp="$(date +'%_b %d %T') " timestamp="$(date +'%_b %d %T') "
case $COMMAND in case $COMMAND in