[java-identity-provider COMMIT] /trunk/idp-conf/src/main/resources/conf/logback.xml

[noreply at shibboleth.net]

Author: scantor
Date: Tue Feb 28 16:24:23 2017
New Revision: 8633

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8633&view=rev
Log:
IDP-1129 - Logging properties can't be externally set

https://issues.shibboleth.net/jira/browse/IDP-1129

Modified:
    trunk/idp-conf/src/main/resources/conf/logback.xml

Modified: trunk/idp-conf/src/main/resources/conf/logback.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/logback.xml?rev=8633&r1=8632&r2=8633&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/logback.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/logback.xml	Tue Feb 28 16:24:23 2017
@@ -5,64 +5,66 @@
     Variables for simplifying logging configuration.
     http://logback.qos.ch/manual/configuration.html#variableSubstitution
     -->
-    
-    <variable name="idp.logfiles" value="${idp.home}/logs" />
-    <variable name="idp.loghistory" value="180" />
-    
-    <!-- Much higher performance if you operate on DEBUG. -->
-    <!-- <variable name="idp.process.appender" value="ASYNC_PROCESS" /> -->
-    
-    <!-- Logging level shortcuts. -->
-    <variable name="idp.loglevel.idp" value="INFO" />
-    <variable name="idp.loglevel.ldap" value="WARN" />
-    <variable name="idp.loglevel.messages" value="INFO" />
-    <variable name="idp.loglevel.encryption" value="INFO" />
-    <variable name="idp.loglevel.opensaml" value="INFO" />
-    <variable name="idp.loglevel.props" value="INFO" />
-    <variable name="idp.loglevel.httpclient" value="INFO" />
-    
-    <!-- Don't turn these up unless you want a *lot* of noise. -->
-    <variable name="idp.loglevel.spring" value="ERROR" />
-    <variable name="idp.loglevel.container" value="ERROR" />
-    <variable name="idp.loglevel.xmlsec" value="INFO" />
 
     <!--
     If you want to use custom properties in this config file,
     we load the main property file for you.
     -->
     <variable file="${idp.home}/conf/idp.properties" />
+
+    <!-- Location and retention. -->
     
+    <variable name="idp.logfiles" value="${idp.logfiles:-${idp.home}/logs}" />
+    <variable name="idp.loghistory" value="${idp.loghistory:-180}" />
+    
+    <!-- Much higher performance if you operate on DEBUG. -->
+    <!-- <variable name="idp.process.appender" value="ASYNC_PROCESS" /> -->
+    
+    <!-- Logging level shortcuts. -->
+    <variable name="idp.loglevel.idp" value="${idp.loglevel.idp:-INFO}" />
+    <variable name="idp.loglevel.ldap" value="${idp.loglevel.ldap:-WARN}" />
+    <variable name="idp.loglevel.messages" value="${idp.loglevel.messages:-INFO}" />
+    <variable name="idp.loglevel.encryption" value="${idp.loglevel.encryption:-INFO}" />
+    <variable name="idp.loglevel.opensaml" value="${idp.loglevel.opensaml:-INFO}" />
+    <variable name="idp.loglevel.props" value="${idp.loglevel.props:-INFO}" />
+    <variable name="idp.loglevel.httpclient" value="${idp.loglevel.httpclient:-INFO}" />
+    
+    <!-- Don't turn these up unless you want a *lot* of noise. -->
+    <variable name="idp.loglevel.spring" value="${idp.loglevel.spring:-ERROR}" />
+    <variable name="idp.loglevel.container" value="${idp.loglevel.container:-ERROR}" />
+    <variable name="idp.loglevel.xmlsec" value="${idp.loglevel.xmlsec:-INFO}" />
+
     <!-- =========================================================== -->
     <!-- ============== Logging Categories and Levels ============== -->
     <!-- =========================================================== -->
 
     <!-- Logs IdP, but not OpenSAML, messages -->
-    <logger name="net.shibboleth.idp" level="${idp.loglevel.idp:-INFO}"/>
+    <logger name="net.shibboleth.idp" level="${idp.loglevel.idp}"/>
 
     <!-- Logs OpenSAML, but not IdP, messages -->
-    <logger name="org.opensaml.saml" level="${idp.loglevel.opensaml:-INFO}"/>
+    <logger name="org.opensaml.saml" level="${idp.loglevel.opensaml}"/>
     
     <!-- Logs LDAP related messages -->
-    <logger name="org.ldaptive" level="${idp.loglevel.ldap:-WARN}"/>
+    <logger name="org.ldaptive" level="${idp.loglevel.ldap}"/>
 
     <!-- Logs embedded HTTP client messages -->
-    <logger name="org.apache.http" level="${idp.loglevel.httpclient:-INFO}"/>
+    <logger name="org.apache.http" level="${idp.loglevel.httpclient}"/>
     
     <!-- Logs inbound and outbound protocols messages at DEBUG level -->
-    <logger name="PROTOCOL_MESSAGE" level="${idp.loglevel.messages:-INFO}" />
+    <logger name="PROTOCOL_MESSAGE" level="${idp.loglevel.messages}" />
 
     <!-- Logs unencrypted SAML at DEBUG level -->
-    <logger name="org.opensaml.saml.saml2.encryption.Encrypter" level="${idp.loglevel.encryption:-INFO}" />
+    <logger name="org.opensaml.saml.saml2.encryption.Encrypter" level="${idp.loglevel.encryption}" />
 
     <!-- Logs system properties during startup at DEBUG level -->
-    <logger name="net.shibboleth.idp.log.LogbackLoggingService" level="${idp.loglevel.props:-INFO}" />

[... 52 lines stripped ...]