From 2f5eb26fcdf4367b7305de4d976c8df167597c0e Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 15 Feb 2006 15:43:32 +0000
Subject: [PATCH] Restore log messages

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3488 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/changelog.txt    |  2 ++
 Shorewall/compiler         | 12 ++++++++++++
 Shorewall/releasenotes.txt | 15 +++++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index 6aa3096cb..88b34ef78 100755
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -78,3 +78,5 @@ Changes in 3.1.x.
 34) Correct Makefile.
 
 35) Add -t option
+
+36) Restore log messages.
diff --git a/Shorewall/compiler b/Shorewall/compiler
index 25d6b5765..7fdaaca46 100755
--- a/Shorewall/compiler
+++ b/Shorewall/compiler
@@ -8665,6 +8665,18 @@ __EOF__
 
     cp -f \$(my_pathname) /var/lib/shorewall/.restore
 
+    case \$COMMAND in
+	start)
+	    logger "Shorewall started"
+	    ;;
+	restart)
+	    logger "Shorewall restarted"
+	    ;;
+	restore)
+	    logger "Shorewall restored"
+	    ;;
+    esac
+
 }
 
 #
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 006cdc950..b01aad825 100755
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -37,11 +37,26 @@ Problems Corrected in 3.1.6
     a re-compilation always occured even if the restore file was
     current.
 
+3)  Log messages for "started", "restarted" and "restored" are once again
+    generated.
+
 Other changes in 3.1.7
 
 1)  'tcpsyn' has been changed to 'tcp:syn' (tcpsyn was added in 3.1.6).
     This new syntax is easier to extend in the future than was the old.
 
+2)  /sbin/shorewall now supports a "-t" option that causes all progress
+    messages to be timestamped.
+
+    Example (VERBOSITY=0 in shorewall.conf):
+
+    gateway:/etc/shorewall # shorewall -t restart
+    07:08:51 Compiling...
+    07:09:05 Shorewall configuration compiled to /var/lib/shorewall/.restart
+    07:09:05 Restarting Shorewall....
+    07:09:08 done.
+    gateway:/etc/shorewall #
+
 Migration Considerations:
 
 1)  A number of macros have been split into two.  The macros affected are: