Adjust logging files, add console logging for command line.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2172 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/configs/Makefile.am b/configs/Makefile.am
index 89c8fc4..eeb0a6a 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -27,7 +27,8 @@ BUILTCONFIGFILES = \
 # While BUILTCONFIGFILES are processed, these are not; so we should pull
 # them from SRCDIR.
 CONFIGFILES = \
-       shibboleth.logger \
+       console.logger \
+       syslog.logger \
        accessError.html \
        rmError.html \
        sessionError.html \
@@ -120,7 +121,8 @@ EXTRA_DIST = .cvsignore \
        apache2.config.in \
        apache22.config.in \
        shibd.in \
-       shibboleth.logger \
+       console.logger \
+       syslog.logger \
        accessError.html \
        rmError.html \
        sessionError.html \

diff --git a/configs/console.logger b/configs/console.logger
new file mode 100644 (file)
index 0000000..f390e1a
--- /dev/null
+++ b/configs/console.logger
@@ -0,0 +1,9 @@
+log4j.rootCategory=INFO, console\r
+\r
+# fairly verbose for DEBUG, so generally leave at INFO\r
+log4j.category.XMLTooling.XMLObject=INFO\r
+\r
+log4j.appender.console=org.apache.log4j.ConsoleAppender\r
+#log4j.appender.console.layout=org.apache.log4j.BasicLayout\r
+log4j.appender.console.layout=org.apache.log4j.PatternLayout\r
+log4j.appender.console.layout.ConversionPattern=%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n\r

diff --git a/configs/native.logger.in b/configs/native.logger.in
index 024150d..9316513 100644 (file)
--- a/configs/native.logger.in
+++ b/configs/native.logger.in
@@ -1,12 +1,13 @@
 # set overall behavior
 log4j.rootCategory=INFO, native_log
 
-# these are fairly verbose for DEBUG, so generally leave at INFO
-log4j.category.SAML.XML=INFO
-log4j.category.shibtarget.XMLApplication=INFO
+# fairly verbose for DEBUG, so generally leave at INFO
+log4j.category.XMLTooling.XMLObject=INFO
 
-# shut off transaction log from this end
-log4j.category.Shibboleth-TRANSACTION=WARN
+# the tran log blocks the "default" appender(s) at runtime
+# Level should be left at INFO for this category
+log4j.category.Shibboleth-TRANSACTION=INFO, tran_log
+log4j.additivity.Shibboleth-TRANSACTION=false
 
 # define the appenders
 
@@ -17,3 +18,10 @@ log4j.appender.native_log.maxBackupIndex=10
 #log4j.appender.native_log.layout=org.apache.log4j.BasicLayout
 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.tran_log=org.apache.log4j.RollingFileAppender
+log4j.appender.tran_log.fileName=@-PKGLOGDIR-@/transaction.log
+log4j.appender.tran_log.maxFileSize=1000000
+log4j.appender.tran_log.maxBackupIndex=20
+log4j.appender.tran_log.layout=org.apache.log4j.PatternLayout
+log4j.appender.tran_log.layout.ConversionPattern=%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n

diff --git a/configs/shibboleth.xml.in b/configs/shibboleth.xml.in
index 93d84a8..cae28ea 100644 (file)
--- a/configs/shibboleth.xml.in
+++ b/configs/shibboleth.xml.in
@@ -3,7 +3,7 @@
        xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="urn:mace:shibboleth:sp:config:2.0 @-PKGXMLDIR-@/shibboleth-spconfig-2.0.xsd"
-       logger="@-PKGSYSCONFDIR-@/shibboleth.logger" clockSkew="180">
+       logger="@-PKGSYSCONFDIR-@/syslog.logger" clockSkew="180">
 
        <!--
        <Extensions>

diff --git a/configs/shibd.logger.in b/configs/shibd.logger.in
index 1cf9c30..f8c6377 100644 (file)
--- a/configs/shibd.logger.in
+++ b/configs/shibd.logger.in
@@ -1,9 +1,8 @@
 # set overall behavior
 log4j.rootCategory=INFO, shibd_log
 
-# these are fairly verbose for DEBUG, so generally leave at INFO
-log4j.category.SAML.XML=INFO
-log4j.category.shibtarget.XMLApplication=INFO
+# fairly verbose for DEBUG, so generally leave at INFO
+log4j.category.XMLTooling.XMLObject=INFO
 
 # the tran log blocks the "default" appender(s) at runtime
 # Level should be left at INFO for this category

diff --git a/configs/shibboleth.logger b/configs/syslog.logger
similarity index 72%
rename from configs/shibboleth.logger
rename to configs/syslog.logger
index 433df66..1730d48 100644 (file)
--- a/configs/shibboleth.logger
+++ b/configs/syslog.logger
@@ -1,8 +1,7 @@
 log4j.rootCategory=INFO, syslog
 
-# these are fairly verbose for DEBUG, so generally leave at INFO
-log4j.category.SAML.XML=INFO
-log4j.category.shibtarget.XMLApplication=INFO
+# fairly verbose for DEBUG, so generally leave at INFO
+log4j.category.XMLTooling.XMLObject=INFO
 
 log4j.appender.syslog=org.apache.log4j.SyslogAppender
 log4j.appender.syslog.syslogName=shib
@@ -10,3 +9,4 @@ log4j.appender.syslog.syslogHost=localhost
 #log4j.appender.syslog.layout=org.apache.log4j.BasicLayout
 log4j.appender.syslog.layout=org.apache.log4j.PatternLayout
 log4j.appender.syslog.layout.ConversionPattern=%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n
+

diff --git a/shibsp/base.h b/shibsp/base.h
index 95ee5bc..757726f 100644 (file)
--- a/shibsp/base.h
+++ b/shibsp/base.h
@@ -91,6 +91,6 @@
  * Controls default logging level of console tools and other situations
  * where fully-configured logging isn't used.
  */
-#define SHIBSP_LOGGING "WARN"
+#define SHIBSP_LOGGING "c:\\opt\\shibboleth-sp\\etc\\shibboleth\\console.logger"
 
 #endif /* __shibsp_base_h__ */

diff --git a/shibsp/paths.h.in b/shibsp/paths.h.in
index e6cebd3..00b5594 100644 (file)
--- a/shibsp/paths.h.in
+++ b/shibsp/paths.h.in
@@ -33,4 +33,9 @@
  */\r
 #define SHIBSP_CONFIG "@-PKGSYSCONFDIR-@/shibboleth.xml"\r
 \r
+/**\r
+ * Default location of SP configuration file.\r
+ */\r
+#define SHIBSP_LOGGING "@-PKGSYSCONFDIR-@/console.logger"\r
+\r
 #endif /* __shibsp_paths_h__ */\r

diff --git a/util/samlquery.cpp b/util/samlquery.cpp
index d71ea08..101fc6e 100644 (file)
--- a/util/samlquery.cpp
+++ b/util/samlquery.cpp
@@ -97,6 +97,8 @@ int main(int argc,char* argv[])
     if (!a_param)\r
         a_param="default";\r
 \r
+    XMLToolingConfig::getConfig().log_config(getenv("SHIBSP_LOGGING") ? getenv("SHIBSP_LOGGING") : SHIBSP_LOGGING);\r
+\r
     SPConfig& conf=SPConfig::getConfig();\r
     conf.setFeatures(\r
         SPConfig::Metadata |\r