[cpp-sp] branch master updated: SSPCPP-794 - Change default logging for inproc half of SP
Scott Cantor
cantor.2 at osu.edu
Fri Apr 20 13:11:41 EDT 2018
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=f0ce5a1f04ed66ec872a0157a30477b9b7abf330
The following commit(s) were added to refs/heads/master by this push:
new f0ce5a1 SSPCPP-794 - Change default logging for inproc half of SP
f0ce5a1 is described below
commit f0ce5a1f04ed66ec872a0157a30477b9b7abf330
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Apr 20 13:11:17 2018 -0400
SSPCPP-794 - Change default logging for inproc half of SP
https://issues.shibboleth.net/jira/browse/SSPCPP-794
Convert non-Windows half to local syslog.
---
configs/Makefile.am | 9 ++-------
configs/native.logger | 38 ++++++++++++++++++++++++++++++++++++++
configs/native.logger.in | 43 -------------------------------------------
shibboleth.spec.in | 10 ----------
4 files changed, 40 insertions(+), 60 deletions(-)
diff --git a/configs/Makefile.am b/configs/Makefile.am
index d899426..f5f231e 100644
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -44,7 +44,7 @@ CONFIGFILES = \
example-metadata.xml \
example-shibboleth3.xml \
console.logger \
- syslog.logger \
+ native.logger \
accessError.html \
attrChecker.html \
sessionError.html \
@@ -108,9 +108,6 @@ shibd-osx.plist: ${srcdir}/shibd-osx.plist.in Makefile ${top_builddir}/config.st
shibd.logger: ${srcdir}/shibd.logger.in Makefile ${top_builddir}/config.status
$(MAKE) do-build-file FILE=$@
-native.logger: ${srcdir}/native.logger.in Makefile ${top_builddir}/config.status
- $(MAKE) do-build-file FILE=$@
-
all-data-local: $(BUILTCONFIGFILES)
install-data-local: all-data-local
@@ -152,11 +149,9 @@ CLEANFILES = \
shibd-suse \
shibd-debian \
shibd-osx.plist \
- shibd.logger \
- native.logger
+ shibd.logger
EXTRA_DIST = \
- native.logger.in \
shibd.logger.in \
apache.config.in \
apache2.config.in \
diff --git a/configs/native.logger b/configs/native.logger
new file mode 100644
index 0000000..74cf265
--- /dev/null
+++ b/configs/native.logger
@@ -0,0 +1,38 @@
+# 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
+
+# Change to SyslogAppender for remote syslog, and set host/port
+log4j.appender.native_log=org.apache.log4j.LocalSyslogAppender
+#log4j.appender.native_log.syslogHost=localhost
+#log4j.appender.native_log.portNumber=514
+log4j.appender.native_log.syslogName=shibboleth
+# Facility is numeric, 16 is LOCAL0
+log4j.appender.native_log.facility=16
+log4j.appender.native_log.layout=org.apache.log4j.PatternLayout
+log4j.appender.native_log.layout.ConversionPattern=%p %c %x: %m%n
diff --git a/configs/native.logger.in b/configs/native.logger.in
deleted file mode 100644
index 52a90ae..0000000
--- a/configs/native.logger.in
+++ /dev/null
@@ -1,43 +0,0 @@
-# set overall behavior
-log4j.rootCategory=INFO, native_log, warn_log
-
-# fairly verbose for DEBUG, so generally leave at INFO
-log4j.category.XMLTooling.XMLObject=INFO
-log4j.category.XMLTooling.KeyInfoResolver=INFO
-log4j.category.Shibboleth.IPRange=INFO
-log4j.category.Shibboleth.PropertySet=INFO
-
-# raise for low-level tracing of SOAP client HTTP/SSL behavior
-log4j.category.XMLTooling.libcurl=INFO
-
-# 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.RollingFileAppender
-log4j.appender.native_log.fileName=@-SHIRELOGDIR-@/native.log
-log4j.appender.native_log.maxFileSize=1000000
-log4j.appender.native_log.maxBackupIndex=10
-log4j.appender.native_log.layout=org.apache.log4j.PatternLayout
-log4j.appender.native_log.layout.ConversionPattern=%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n
-
-log4j.appender.warn_log=org.apache.log4j.RollingFileAppender
-log4j.appender.warn_log.fileName=@-SHIRELOGDIR-@/native_warn.log
-log4j.appender.warn_log.maxFileSize=1000000
-log4j.appender.warn_log.maxBackupIndex=10
-log4j.appender.warn_log.layout=org.apache.log4j.PatternLayout
-log4j.appender.warn_log.layout.ConversionPattern=%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n
-log4j.appender.warn_log.threshold=WARN
diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index f4aec9d..8fd4e18 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -415,16 +415,6 @@ exit 0
%dir %{_libdir}/shibboleth
%{_libdir}/shibboleth/*
%attr(0750,%{runuser},%{runuser}) %dir %{_localstatedir}/log/shibboleth
-%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon" || "%{_vendor}" == "suse"
-%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
-%attr(0750,apache,apache) %dir %{_localstatedir}/log/shibboleth-www
-%endif
-%if "%{_vendor}" == "suse"
-%attr(0750,wwwrun,www) %dir %{_localstatedir}/log/shibboleth-www
-%endif
-%else
-%attr(0750,-,-) %dir %{_localstatedir}/log/shibboleth-www
-%endif
%if 0%{?suse_version} < 1300
%attr(0755,%{runuser},%{runuser}) %dir %{_localstatedir}/run/shibboleth
%endif
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list