X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeLogger.java;h=947d4d89e6e90a0199cb8dd1ea84bfaceeaf0bf1;hb=1b09095425a7c067c097eb91bed5b4a4a33f0dc8;hp=5571d70acc81e3323da4135d1f0320334ad0f583;hpb=c70b26dbc9a322a0a7fe3f78982ba57980d39fb1;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java
index 5571d70ac..947d4d89e 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java
@@ -57,9 +57,9 @@ import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.log.LogEntry;
+import org.osgi.service.log.LogLevel;
 import org.osgi.service.log.LogListener;
 import org.osgi.service.log.LogReaderService;
-import org.osgi.service.log.LogService;
 
 /** Not meant to be used directly in standard log4j config */
 class NodeLogger implements ArgeoLogger, LogListener {
@@ -171,22 +171,25 @@ class NodeLogger implements ArgeoLogger, LogListener {
 	//
 	// OSGi LOGGER
 	//
-	@SuppressWarnings("deprecation")
 	@Override
 	public void logged(LogEntry status) {
 		Log pluginLog = LogFactory.getLog(status.getBundle().getSymbolicName());
-		Integer severity = status.getLevel();
-		if (severity == LogService.LOG_ERROR) {
+		LogLevel severity = status.getLogLevel();
+		if (severity.equals(LogLevel.ERROR) && pluginLog.isErrorEnabled()) {
 			// FIXME Fix Argeo TP
 			if (status.getException() instanceof SignatureException)
 				return;
-			// pluginLog.error(msg(status), status.getException());
-			pluginLog.error(msg(status) + ": " + status.getException());
-		} else if (severity == LogService.LOG_WARNING)
-			pluginLog.warn(msg(status), status.getException());
-		else if (severity == LogService.LOG_INFO && pluginLog.isDebugEnabled())
+			pluginLog.error(msg(status), status.getException());
+		} else if (severity.equals(LogLevel.WARN) && pluginLog.isWarnEnabled()) {
+			if (pluginLog.isTraceEnabled())
+				pluginLog.warn(msg(status), status.getException());
+			else
+				pluginLog.warn(msg(status));
+		} else if (severity.equals(LogLevel.INFO) && pluginLog.isDebugEnabled())
 			pluginLog.debug(msg(status), status.getException());
-		else if (severity == LogService.LOG_DEBUG && pluginLog.isTraceEnabled())
+		else if (severity.equals(LogLevel.DEBUG) && pluginLog.isTraceEnabled())
+			pluginLog.trace(msg(status), status.getException());
+		else if (severity.equals(LogLevel.TRACE) && pluginLog.isTraceEnabled())
 			pluginLog.trace(msg(status), status.getException());
 	}