X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.init%2Fsrc%2Forg%2Fargeo%2Finit%2Flogging%2FThinJavaUtilLogging.java;h=f1143d670af8647746702bdd361cd721c7647b57;hb=8be06a167888a8ba1f262bbe34c70385807d11c0;hp=7670c2573a2c9deba0f1085b0c2d6377f56211d0;hpb=938f9575c8091c723fa076f3c962e4b29556d2c5;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.init/src/org/argeo/init/logging/ThinJavaUtilLogging.java b/org.argeo.init/src/org/argeo/init/logging/ThinJavaUtilLogging.java
index 7670c2573..f1143d670 100644
--- a/org.argeo.init/src/org/argeo/init/logging/ThinJavaUtilLogging.java
+++ b/org.argeo.init/src/org/argeo/init/logging/ThinJavaUtilLogging.java
@@ -1,18 +1,106 @@
 package org.argeo.init.logging;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.lang.System.Logger.Level;
+import java.util.Map;
+import java.util.Properties;
+import java.util.logging.Handler;
 import java.util.logging.LogManager;
-import java.util.logging.Logger;
+import java.util.logging.LogRecord;
 
 /**
- * Fallback wrapper around the java.util.logging framework, when thinb logging
+ * Fallback wrapper around the java.util.logging framework, when thin logging
  * could not be instantiated directly.
  */
 class ThinJavaUtilLogging {
-	public static void init() {
+	private LogManager logManager;
+
+	private ThinJavaUtilLogging(LogManager logManager) {
+		this.logManager = logManager;
+		this.logManager.reset();
+	}
+
+	static ThinJavaUtilLogging init() {
 		LogManager logManager = LogManager.getLogManager();
-		logManager.reset();
-		Logger rootLogger = logManager.getLogger("");
-		rootLogger.addHandler(new ThinHandler());
-		rootLogger.setLevel(java.util.logging.Level.INFO);
+		ThinJavaUtilLogging thinJul = new ThinJavaUtilLogging(logManager);
+		return thinJul;
+	}
+
+	private static Level fromJulLevel(java.util.logging.Level julLevel) {
+		if (java.util.logging.Level.ALL.equals(julLevel))
+			return Level.ALL;
+		else if (java.util.logging.Level.FINER.equals(julLevel))
+			return Level.TRACE;
+		else if (java.util.logging.Level.FINE.equals(julLevel))
+			return Level.DEBUG;
+		else if (java.util.logging.Level.INFO.equals(julLevel))
+			return Level.INFO;
+		else if (java.util.logging.Level.WARNING.equals(julLevel))
+			return Level.WARNING;
+		else if (java.util.logging.Level.SEVERE.equals(julLevel))
+			return Level.ERROR;
+		else if (java.util.logging.Level.OFF.equals(julLevel))
+			return Level.OFF;
+		else
+			throw new IllegalArgumentException("Unsupported JUL level " + julLevel);
+	}
+
+	private static java.util.logging.Level toJulLevel(Level level) {
+		if (Level.ALL.equals(level))
+			return java.util.logging.Level.ALL;
+		else if (Level.TRACE.equals(level))
+			return java.util.logging.Level.FINER;
+		else if (Level.DEBUG.equals(level))
+			return java.util.logging.Level.FINE;
+		else if (Level.INFO.equals(level))
+			return java.util.logging.Level.INFO;
+		else if (Level.WARNING.equals(level))
+			return java.util.logging.Level.WARNING;
+		else if (Level.ERROR.equals(level))
+			return java.util.logging.Level.SEVERE;
+		else if (Level.OFF.equals(level))
+			return java.util.logging.Level.OFF;
+		else
+			throw new IllegalArgumentException("Unsupported logging level " + level);
+	}
+
+	void readConfiguration(Map<String, Level> configuration) {
+		this.logManager.reset();
+		Properties properties = new Properties();
+		for (String name : configuration.keySet()) {
+			properties.put(name + ".level", toJulLevel(configuration.get(name)).toString());
+		}
+		try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+			properties.store(out, null);
+			try (ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray())) {
+				logManager.readConfiguration(in);
+			}
+		} catch (IOException e) {
+			throw new IllegalStateException("Cannot apply JUL configuration", e);
+		}
+		logManager.getLogger("").addHandler(new ThinHandler());
+	}
+
+	/**
+	 * A fallback {@link Handler} forwarding only messages and logger name (all
+	 * other {@link LogRecord} information is lost.
+	 */
+	private static class ThinHandler extends Handler {
+		@Override
+		public void publish(LogRecord record) {
+			java.lang.System.Logger systemLogger = ThinLoggerFinder.getLogger(record.getLoggerName());
+			systemLogger.log(ThinJavaUtilLogging.fromJulLevel(record.getLevel()), record.getMessage());
+		}
+
+		@Override
+		public void flush() {
+		}
+
+		@Override
+		public void close() throws SecurityException {
+		}
+
 	}
 }