X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.init%2Fsrc%2Forg%2Fargeo%2Finit%2Flogging%2FThinLogging.java;h=16e792776566a51502a5aa0924f369cecb8adab3;hb=4e37b03e8835e4f15520e5e0d15252f49d09cf3a;hp=e21899394dda63abdef24514b9bad69516974472;hpb=def1b847ee067994c32f49107e22d3c04eac2b0e;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.init/src/org/argeo/init/logging/ThinLogging.java b/org.argeo.init/src/org/argeo/init/logging/ThinLogging.java
index e21899394..16e792776 100644
--- a/org.argeo.init/src/org/argeo/init/logging/ThinLogging.java
+++ b/org.argeo.init/src/org/argeo/init/logging/ThinLogging.java
@@ -16,11 +16,9 @@ import java.util.ResourceBundle;
 import java.util.SortedMap;
 import java.util.StringTokenizer;
 import java.util.TreeMap;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.Flow;
 import java.util.concurrent.Flow.Subscription;
+import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.SubmissionPublisher;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
@@ -51,24 +49,33 @@ class ThinLogging implements Consumer<Map<String, Object>> {
 	private NavigableMap<String, Level> levels = new TreeMap<>();
 	private volatile boolean updatingConfiguration = false;
 
-	private final ExecutorService executor;
+//	private final ExecutorService executor;
 	private final LogEntryPublisher publisher;
+	private PrintStreamSubscriber synchronousSubscriber;
 
 	private final boolean journald;
 	private final Level callLocationLevel;
 
-	ThinLogging() {
-		executor = Executors.newCachedThreadPool((r) -> {
-			Thread t = new Thread(r);
-			t.setDaemon(true);
-			return t;
-		});
-		publisher = new LogEntryPublisher(executor, Flow.defaultBufferSize());
+	private boolean synchronous = true;
 
-		PrintStreamSubscriber subscriber = new PrintStreamSubscriber();
-		publisher.subscribe(subscriber);
+	ThinLogging() {
+//		executor = Executors.newCachedThreadPool((r) -> {
+//			Thread t = new Thread(r);
+//			t.setDaemon(true);
+//			return t;
+//		});
+		if (synchronous) {
+			publisher = new LogEntryPublisher();
+			synchronousSubscriber = new PrintStreamSubscriber();
+		} else {
+			publisher = new LogEntryPublisher();
+
+			PrintStreamSubscriber subscriber = new PrintStreamSubscriber();
+			publisher.subscribe(subscriber);
+
+			Runtime.getRuntime().addShutdownHook(new Thread(() -> close(), "Log shutdown"));
 
-		Runtime.getRuntime().addShutdownHook(new Thread(() -> close(), "Log shutdown"));
+		}
 
 		// initial default level
 		levels.put("", Level.WARNING);
@@ -131,7 +138,8 @@ class ThinLogging implements Consumer<Map<String, Object>> {
 		try {
 			// we ait a bit in order to make sure all messages are flushed
 			// TODO synchronize more efficiently
-			executor.awaitTermination(300, TimeUnit.MILLISECONDS);
+			// executor.awaitTermination(300, TimeUnit.MILLISECONDS);
+			ForkJoinPool.commonPool().awaitTermination(300, TimeUnit.MILLISECONDS);
 		} catch (InterruptedException e) {
 			// silent
 		}
@@ -286,8 +294,19 @@ class ThinLogging implements Consumer<Map<String, Object>> {
 
 			// NOTE: this is the method called when logging a plain message without
 			// exception, so it should be considered as a format only when args are not null
-			if (format.contains("{}"))// workaround for weird Jetty formatting
-				params = null;
+//			if (format.contains("{}"))// workaround for weird Jetty formatting
+//				params = null;
+			// TODO move this to slf4j wrapper?
+			if (format.contains("{}")) {
+				StringBuilder sb = new StringBuilder();
+				String[] segments = format.split("\\{\\}");
+				for (int i = 0; i < segments.length; i++) {
+					sb.append(segments[i]);
+					if (i != (segments.length - 1))
+						sb.append("{" + i + "}");
+				}
+				format = sb.toString();
+			}
 			String msg = params == null ? format : MessageFormat.format(format, params);
 			publisher.log(this, level, bundle, msg, now, thread, (Throwable) null, findCallLocation(level, thread));
 		}
@@ -342,8 +361,8 @@ class ThinLogging implements Consumer<Map<String, Object>> {
 
 	private class LogEntryPublisher extends SubmissionPublisher<Map<String, Serializable>> {
 
-		private LogEntryPublisher(Executor executor, int maxBufferCapacity) {
-			super(executor, maxBufferCapacity);
+		private LogEntryPublisher() {
+			super();
 		}
 
 		private void log(ThinLogger logger, Level level, ResourceBundle bundle, String msg, Instant instant,
@@ -372,8 +391,13 @@ class ThinLogging implements Consumer<Map<String, Object>> {
 			logEntry.put(KEY_THREAD, thread.getName());
 
 			// should be unmodifiable for security reasons
-			if (!isClosed())
-				submit(Collections.unmodifiableMap(logEntry));
+			if (synchronous) {
+				assert synchronousSubscriber != null;
+				synchronousSubscriber.onNext(logEntry);
+			} else {
+				if (!isClosed())
+					submit(Collections.unmodifiableMap(logEntry));
+			}
 		}
 
 	}
@@ -559,6 +583,16 @@ class ThinLogging implements Consumer<Map<String, Object>> {
 		logger.log(Logger.Level.INFO, "Log info");
 		logger.log(Logger.Level.WARNING, "Log warning");
 		logger.log(Logger.Level.ERROR, "Log exception", new Throwable());
+
+		try {
+			// we ait a bit in order to make sure all messages are flushed
+			// TODO synchronize more efficiently
+			// executor.awaitTermination(300, TimeUnit.MILLISECONDS);
+			ForkJoinPool.commonPool().awaitTermination(300, TimeUnit.MILLISECONDS);
+		} catch (InterruptedException e) {
+			// silent
+		}
+
 	}
 
 }