X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeLogger.java;h=1d296c5b9cc45f2a9a057bbf827ddfa08d36ccf2;hb=f552b4781dca895ba2b09e41160748d3b3f63daf;hp=0c5899795a73fb4d29638a337dee8e00a3ec4c7e;hpb=294a8476385ed2df2f40122a07d8e0f40a65646d;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 0c5899795..1d296c5b9 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
@@ -46,20 +46,20 @@ import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 import org.apache.log4j.spi.LoggingEvent;
+import org.argeo.api.ArgeoLogListener;
+import org.argeo.api.ArgeoLogger;
+import org.argeo.api.NodeConstants;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.CurrentUser;
-import org.argeo.node.ArgeoLogListener;
-import org.argeo.node.ArgeoLogger;
-import org.argeo.node.NodeConstants;
 import org.argeo.osgi.useradmin.UserAdminConf;
 import org.osgi.framework.Bundle;
 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,21 +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());
-		} else if (severity == LogService.LOG_WARNING)
-			pluginLog.warn(msg(status), status.getException());
-		else if (severity == LogService.LOG_INFO && pluginLog.isDebugEnabled())
+		} 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());
 	}