X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.init%2Fsrc%2Forg%2Fargeo%2Finit%2Flogging%2FThinLoggerFinder.java;h=f443b2e669d28aa9599716e126adb24397db6f66;hb=1010bff4f1ffadbf3f7988fbd3eba70f5d672c88;hp=4147534dd2695abcdc393f7c988ef49965ddc4df;hpb=8be06a167888a8ba1f262bbe34c70385807d11c0;p=lgpl%2Fargeo-commons.git

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 4147534dd..f443b2e66 100644
--- a/org.argeo.init/src/org/argeo/init/logging/ThinLoggerFinder.java
+++ b/org.argeo.init/src/org/argeo/init/logging/ThinLoggerFinder.java
@@ -1,10 +1,13 @@
 package org.argeo.init.logging;
 
+import java.io.Serializable;
 import java.lang.System.Logger;
 import java.lang.System.LoggerFinder;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.Flow;
+import java.util.function.Consumer;
 
 /**
  * Factory for Java system logging. As it has to be a public class in order to
@@ -29,7 +32,7 @@ public class ThinLoggerFinder extends LoggerFinder {
 	private static void init() {
 		logging = new ThinLogging();
 
-		Map<String, String> configuration = new HashMap<>();
+		Map<String, Object> configuration = new HashMap<>();
 		for (Object key : System.getProperties().keySet()) {
 			Objects.requireNonNull(key);
 			String property = key.toString();
@@ -37,11 +40,12 @@ public class ThinLoggerFinder extends LoggerFinder {
 					|| property.equals(ThinLogging.DEFAULT_LEVEL_PROPERTY))
 				configuration.put(property, System.getProperty(property));
 		}
-		logging.update(configuration);
+		logging.accept(configuration);
 	}
 
 	/**
-	 * Falls back to java.util.logging if thin logging was not already initialised.
+	 * Falls back to java.util.logging if thin logging was not already initialised
+	 * by the {@link LoggerFinder} mechanism.
 	 */
 	public static void lazyInit() {
 		if (logging != null)
@@ -53,10 +57,20 @@ public class ThinLoggerFinder extends LoggerFinder {
 		javaUtilLogging.readConfiguration(logging.getLevels());
 	}
 
-	public static void update(Map<String, String> configuration) {
+	public static Consumer<Map<String, Object>> getConfigurationConsumer() {
+		Objects.requireNonNull(logging);
+		return logging;
+	}
+
+	public static Flow.Publisher<Map<String, Serializable>> getLogEntryPublisher() {
+		Objects.requireNonNull(logging);
+		return logging.getLogEntryPublisher();
+	}
+
+	static void update(Map<String, Object> configuration) {
 		if (logging == null)
 			throw new IllegalStateException("Thin logging must be initialized first");
-		logging.update(configuration);
+		logging.accept(configuration);
 		if (javaUtilLogging != null)
 			javaUtilLogging.readConfiguration(logging.getLevels());
 	}