Merge remote-tracking branch 'origin/merge-to-testing' into testing

[lgpl/argeo-commons.git] / org.argeo.init / src / org / argeo / init / logging / ThinLoggerFinder.java

diff --git a/org.argeo.init/src/org/argeo/init/logging/ThinLoggerFinder.java b/org.argeo.init/src/org/argeo/init/logging/ThinLoggerFinder.java
index f443b2e669d28aa9599716e126adb24397db6f66..e60d22fba1061238e20da6b0071afdfdcf03ca7a 100644 (file)
--- a/org.argeo.init/src/org/argeo/init/logging/ThinLoggerFinder.java
+++ b/org.argeo.init/src/org/argeo/init/logging/ThinLoggerFinder.java
@@ -21,17 +21,24 @@ public class ThinLoggerFinder extends LoggerFinder {
        public ThinLoggerFinder() {
                if (logging != null)
                        throw new IllegalStateException("Only one logging can be initialised.");
-               init();
+//             init();
        }
 
        @Override
        public Logger getLogger(String name, Module module) {
+               lazyInit();
                return logging.getLogger(name, module);
        }
 
        private static void init() {
                logging = new ThinLogging();
+               reloadConfiguration();
+       }
 
+       /** Reload configuration form system properties */
+       public static void reloadConfiguration() {
+               if (logging == null)
+                       return;
                Map<String, Object> configuration = new HashMap<>();
                for (Object key : System.getProperties().keySet()) {
                        Objects.requireNonNull(key);