Author: [log in to unmask]
Date: Tue Oct 6 22:37:17 2015
New Revision: 3786
Log:
Remove check on property settings to make this actually work.
Modified:
java/trunk/logging/src/main/java/org/hps/logging/config/DefaultLoggingConfig.java
Modified: java/trunk/logging/src/main/java/org/hps/logging/config/DefaultLoggingConfig.java
=============================================================================
--- java/trunk/logging/src/main/java/org/hps/logging/config/DefaultLoggingConfig.java (original)
+++ java/trunk/logging/src/main/java/org/hps/logging/config/DefaultLoggingConfig.java Tue Oct 6 22:37:17 2015
@@ -13,21 +13,13 @@
/**
* Class constructor which reads in a logging properties file from a classpath resource.
- * <p>
- * The default configuration will only be activated if there is no file or class specified
- * from a system property.
*/
public DefaultLoggingConfig() {
- // Activate the default config if the logging system properties are not set.
- if (System.getProperty("java.util.logging.config.class") == null
- && System.getProperty("java.util.logging.config.file") == null) {
- InputStream inputStream = DefaultLoggingConfig.class.getResourceAsStream("logging.properties");
- try {
- LogManager.getLogManager().readConfiguration(inputStream);
- } catch (SecurityException | IOException e) {
- throw new RuntimeException("Initialization of default logging configuration failed.", e);
- }
- }
+ InputStream inputStream = DefaultLoggingConfig.class.getResourceAsStream("logging.properties");
+ try {
+ LogManager.getLogManager().readConfiguration(inputStream);
+ } catch (SecurityException | IOException e) {
+ throw new RuntimeException("Initialization of default logging configuration failed.", e);
+ }
}
-
}
