Make Eclipse log less verbose

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / NodeLogger.java

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 045229ce1fc81eadfe7fb8bade2e317c4f99270f..133d82496f67258e21fc13fffa0a3f8f01008cc1 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java
@@ -16,6 +16,7 @@
 package org.argeo.cms.internal.kernel;
 
 import java.io.IOException;
+import java.net.URI;
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -51,6 +52,7 @@ 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;
@@ -115,7 +117,11 @@ class NodeLogger implements ArgeoLogger, LogListener {
                                        log4jConfiguration = log4jConfiguration.substring("file:".length());
                        }
                        try {
-                               Path log4jconfigPath = Paths.get(log4jConfiguration);
+                               Path log4jconfigPath;
+                               if (log4jConfiguration.startsWith("file:"))
+                                       log4jconfigPath = Paths.get(new URI(log4jConfiguration));
+                               else
+                                       log4jconfigPath = Paths.get(log4jConfiguration);
                                Thread log4jConfWatcher = new Log4jConfWatcherThread(log4jconfigPath);
                                log4jConfWatcher.start();
                        } catch (Exception e) {
@@ -174,7 +180,8 @@ class NodeLogger implements ArgeoLogger, LogListener {
                        // FIXME Fix Argeo TP
                        if (status.getException() instanceof SignatureException)
                                return;
-                       pluginLog.error(msg(status), status.getException());
+                       // pluginLog.error(msg(status), status.getException());
+                       pluginLog.error(msg(status));
                } else if (severity == LogService.LOG_WARNING)
                        pluginLog.warn(msg(status), status.getException());
                else if (severity == LogService.LOG_INFO && pluginLog.isDebugEnabled())
@@ -186,6 +193,10 @@ class NodeLogger implements ArgeoLogger, LogListener {
        private String msg(LogEntry status) {
                StringBuilder sb = new StringBuilder();
                sb.append(status.getMessage());
+               Bundle bundle = status.getBundle();
+               if (bundle != null) {
+                       sb.append(" '" + bundle.getSymbolicName() + "'");
+               }
                ServiceReference<?> sr = status.getServiceReference();
                if (sr != null) {
                        sb.append(' ');