[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/logback.xml idp-core/src/main/java/net/sh...

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Feb  2 12:56:20 2015
New Revision: 7308

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7308&view=rev
Log:
IDP-569 Change LogbackLoggingService to use class logger when logging system properties on DEBUG.

Modified:
    trunk/idp-conf/src/main/resources/conf/logback.xml
    trunk/idp-core/src/main/java/net/shibboleth/idp/log/LogbackLoggingService.java

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=7308&r1=7307&r2=7308&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/logback.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/logback.xml Mon Feb  2 12:56:20 2015
@@ -22,7 +22,7 @@
 
     <!-- Logs standard system properties during startup at DEBUG level -->
     <!-- 
-    <logger name="STARTUP_PROPERTIES" level="DEBUG" />
+    <logger name="net.shibboleth.idp.log.LogbackLoggingService" level="DEBUG" />
     -->
 
     <!-- Especially chatty. -->

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/log/LogbackLoggingService.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/log/LogbackLoggingService.java?rev=7308&r1=7307&r2=7308&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/log/LogbackLoggingService.java (original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/log/LogbackLoggingService.java Mon Feb  2 12:56:20 2015
@@ -57,9 +57,6 @@
  */
 public class LogbackLoggingService extends AbstractReloadableService<Object>
         implements LoggingService, ApplicationContextAware {
-
-    /** Name of logger used to log standard system properties at startup.*/
-    private static final String STARTUP_PROPERTIES_LOGGER = "STARTUP_PROPERTIES";
     
     /** Logback logger context. */
     private LoggerContext loggerContext;
@@ -236,21 +233,19 @@
     /**
      * Log the IdP version and Java version and vendor at INFO level.
      * 
-     * Log system properties defined by {@link StandardSystemProperty} to the
-     * {@link LogbackLoggingService#STARTUP_PROPERTIES_LOGGER} logger at DEBUG level if enabled.
+     * Log system properties defined by {@link StandardSystemProperty} at DEBUG level.
      */
     protected void logImplementationDetails() {
         final Logger logger = LoggerFactory.getLogger(LogbackLoggingService.class);
         logger.info("Shibboleth IdP Version {}", Version.getVersion());
-        logger.info("Java Version='{}' Vendor='{}'", StandardSystemProperty.JAVA_VERSION.value(),
+        logger.info("Java version='{}' vendor='{}'", StandardSystemProperty.JAVA_VERSION.value(),
                 StandardSystemProperty.JAVA_VENDOR.value());
-
-        final Logger startupPropertiesLogger = LoggerFactory.getLogger(STARTUP_PROPERTIES_LOGGER);
-        if (startupPropertiesLogger.isDebugEnabled()) {
+        if (logger.isDebugEnabled()) {
             for (StandardSystemProperty standardSystemProperty : StandardSystemProperty.values()) {
-                startupPropertiesLogger.debug("{}", standardSystemProperty);
-            }
-        }
+                logger.debug("{}", standardSystemProperty);
+            }
+        }
+        System.exit(1);
     }
 
 }