extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-02-02 10:59:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Additional progress messages during up/down processing

Browse Source
This commit is contained in:
Tom Eastep 2010-07-21 20:35:03 -07:00
parent c536680bd6
commit 411d392ccd
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Shorewall/Perl/Shorewall/Zones.pm
View File

@ -1400,6 +1400,9 @@ sub compile_updown() {
'state=cleared', 'state=cleared',
'' ); '' );
emit 'progress_message3 "$g_product $COMMAND triggered by $1"';
emit '';
if ( $family == F_IPV4 ) { if ( $family == F_IPV4 ) {
emit 'if shorewall_is_started; then'; emit 'if shorewall_is_started; then';
} else { } else {
@ -1461,17 +1464,20 @@ sub compile_updown() {
emit( ' COMMAND=start' ); emit( ' COMMAND=start' );
} }
emit( ' detect_configuration', emit( ' progress_message3 "$g_product attempting $COMMAND"',
' detect_configuration',
' define_firewall' ); ' define_firewall' );
if ( $wildcard ) { if ( $wildcard ) {
emit( ' elif [ "$state" = started ]; then', emit( ' elif [ "$state" = started ]; then',
' progress_message3 "$g_product attempting restart"',
' COMMAND=restart', ' COMMAND=restart',
' detect_configuration', ' detect_configuration',
' define_firewall' ); ' define_firewall' );
} else { } else {
emit( ' else', emit( ' else',
' COMMAND=stop', ' COMMAND=stop',
' progress_message3 "$g_product attempting stop"',
' detect_configuration', ' detect_configuration',
' stop_firewall' ); ' stop_firewall' );
} }
@ -1495,10 +1501,12 @@ sub compile_updown() {
'', '',
' if [ "$state" = started ]; then', ' if [ "$state" = started ]; then',
' COMMAND=restart', ' COMMAND=restart',
' progress_message3 "$g_product attempting restart"',
' detect_configuration', ' detect_configuration',
' define_firewall', ' define_firewall',
' elif [ "$state" = stopped ]; then', ' elif [ "$state" = stopped ]; then',
' COMMAND=start', ' COMMAND=start',
' progress_message3 "$g_product attempting start"',
' detect_configuration', ' detect_configuration',
' define_firewall', ' define_firewall',
' fi', ' fi',
@ -1510,6 +1518,7 @@ sub compile_updown() {
' case $state in', ' case $state in',
' started)', ' started)',
' COMMAND=restart', ' COMMAND=restart',
' progress_message3 "$g_product attempting restart"',
' detect_configuration', ' detect_configuration',
' define_firewall', ' define_firewall',
' ;;', ' ;;',