[cpp-sp] branch master updated: Add dedicated native.logger for Windows.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=25763060dbf75540fb10ad3d4f2ddff34d84935f

The following commit(s) were added to refs/heads/master by this push:
       new  2576306   Add dedicated native.logger for Windows.
2576306 is described below

commit 25763060dbf75540fb10ad3d4f2ddff34d84935f
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Apr 17 15:44:01 2018 -0400

    Add dedicated native.logger for Windows.
---
 configs/win-native.logger                  | 31 ++++++++++++++++++++++++++++++
 msi/WiX/ShibbolethSP-noarch.wxs            |  4 ++--
 msi/scripts/shib_edit_config_files.vbs-wix | 14 ++++----------
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/configs/win-native.logger b/configs/win-native.logger
new file mode 100644
index 0000000..7350e32
--- /dev/null
+++ b/configs/win-native.logger
@@ -0,0 +1,31 @@
+# set overall behavior
+log4j.rootCategory=WARN, native_log
+
+# fairly verbose for DEBUG, so generally leave at WARN/INFO
+log4j.category.XMLTooling.XMLObject=WARN
+log4j.category.XMLTooling.KeyInfoResolver=WARN
+log4j.category.Shibboleth.IPRange=WARN
+log4j.category.Shibboleth.PropertySet=WARN
+
+# raise for low-level tracing of SOAP client HTTP/SSL behavior
+log4j.category.XMLTooling.libcurl=WARN
+
+# useful categories to tune independently:
+#
+# tracing of SAML messages and security policies
+#log4j.category.OpenSAML.MessageDecoder=DEBUG
+#log4j.category.OpenSAML.MessageEncoder=DEBUG
+#log4j.category.OpenSAML.SecurityPolicyRule=DEBUG
+# interprocess message remoting
+#log4j.category.Shibboleth.Listener=DEBUG
+# mapping of requests to applicationId
+#log4j.category.Shibboleth.RequestMapper=DEBUG
+# high level session cache operations
+#log4j.category.Shibboleth.SessionCache=DEBUG
+# persistent storage and caching
+#log4j.category.XMLTooling.StorageService=DEBUG
+
+# define the appender
+
+log4j.appender.native_log=org.apache.log4j.NTEventLogAppender
+log4j.appender.native_log.source=Shibboleth Service Provider
diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index b377004..b4024ad 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -127,8 +127,8 @@
             <Component Id="metadataError.html" Guid="{8C46D04A-A943-4FA4-AFCB-9B040306C2C0}">
               <File KeyPath="yes" Name="metadataError.html" />
             </Component>
-            <Component Id="native.logger.in" Guid="{8586D4C7-E237-4C7F-BC79-DE0B06473395}">
-              <File KeyPath="yes" Name="native.logger.in" />
+            <Component Id="native.logger.in" Guid="{B2EBC853-279B-4EA1-BC84-A0EC0E5F3676}">
+              <File KeyPath="yes" Name="native.logger" Source="$(var.SPBuildDirectory)\cpp-sp\configs\win-native.logger" />
             </Component>
             <Component Id="sessionError.html" Guid="{8AA240B3-DC5D-4687-B321-4F5E1BAEA820}">
               <File KeyPath="yes" Name="sessionError.html" />
diff --git a/msi/scripts/shib_edit_config_files.vbs-wix b/msi/scripts/shib_edit_config_files.vbs-wix
index bf8c8b3..e172c83 100644
--- a/msi/scripts/shib_edit_config_files.vbs-wix
+++ b/msi/scripts/shib_edit_config_files.vbs-wix
@@ -88,16 +88,6 @@ if (Err = 0) then
   End If
   FileSystemObj.MoveFile ConfigFile, DistDir & "shibd.logger"
 
-  ConfigFile = DistDir & "native.logger.in"
-  ReplaceInFile ConfigFile, "@-SHIRELOGDIR-@", ConvertedDir & "/var/log/shibboleth"
-  If (NOT FileSystemObj.FileExists(ConfigDir & "native.logger")) then
-    FileSystemObj.CopyFile ConfigFile, ConfigDir & "native.logger", false
-  End If
-  If (FileSystemObj.FileExists(DistDir & "native.logger")) then
-    FileSystemObj.DeleteFile DistDir & "native.logger", true
-  End If
-  FileSystemObj.MoveFile ConfigFile, DistDir & "native.logger"
-
   ConfigFile = DistDir & "apache.config.in"
   ReplaceInFile ConfigFile, "@-PKGLIBDIR-@", ConvertedDir & "/" & LibDir & "/shibboleth"
   ReplaceInFile ConfigFile, "@-PKGWEBDIR-@", ConvertedDir & "/doc/shibboleth"
@@ -150,6 +140,10 @@ if (Err = 0) then
     End If
   End If
 
+  If (NOT FileSystemObj.FileExists(ConfigDir & "native.logger")) then
+    FileSystemObj.CopyFile DistDir & "native.logger", ConfigDir, false
+  End If
+
   If (NOT FileSystemObj.FileExists(ConfigDir & "accessError.html")) then
     FileSystemObj.CopyFile DistDir & "accessError.html", ConfigDir, false
   End If

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.