X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.init%2Fsrc%2Forg%2Fargeo%2Finit%2Flogging%2FThinLogging.java;h=85ed9eb4fe1a79e24dd4efa92be26f532ddd878b;hb=38b432ee473d4d604040fd9c4c234ae17fc7d070;hp=05fdfef1af265c219268aeab389df6d9b4203715;hpb=a960f73a1894dd035bacf11130fd5f9acb93f476;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 05fdfef1a..85ed9eb4f 100644
--- a/org.argeo.init/src/org/argeo/init/logging/ThinLogging.java
+++ b/org.argeo.init/src/org/argeo/init/logging/ThinLogging.java
@@ -294,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));
 		}
@@ -323,6 +334,7 @@ class ThinLogging implements Consumer<Map<String, Object>> {
 					case "org.osgi.service.log.Logger":
 					case "org.eclipse.osgi.internal.log.LoggerImpl":
 					case "org.argeo.api.cms.CmsLog":
+					case "org.argeo.init.osgi.OsgiBootUtils":
 					case "org.slf4j.impl.ArgeoLogger":
 					case "org.argeo.cms.internal.osgi.CmsOsgiLogger":
 					case "org.eclipse.jetty.util.log.Slf4jLog":