X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeLogger.java;h=14d88144d1053df6b360dfa4d791f95cd7575998;hb=d830dd986b7ba3236720fb87e4acc0716e80b3b5;hp=b9475446e5c50a3a04f25030f73ee84e8c9f0bc6;hpb=ba8f8a6fb8ad9649dd03b2ac4670d194f0e1be79;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 b9475446e..14d88144d 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
@@ -37,10 +37,15 @@ import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 import org.apache.log4j.spi.LoggingEvent;
-import org.argeo.ArgeoException;
+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.Constants;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.log.LogEntry;
 import org.osgi.service.log.LogListener;
 import org.osgi.service.log.LogReaderService;
@@ -104,7 +109,7 @@ class NodeLogger implements ArgeoLogger, LogListener {
 			logDispatcherThread = new LogDispatcherThread();
 			logDispatcherThread.start();
 		} catch (Exception e) {
-			throw new ArgeoException("Cannot initialize log4j");
+			throw new CmsException("Cannot initialize log4j");
 		}
 	}
 
@@ -135,15 +140,62 @@ class NodeLogger implements ArgeoLogger, LogListener {
 			// FIXME Fix Argeo TP
 			if (status.getException() instanceof SignatureException)
 				return;
-			pluginLog.error(status.getMessage(), status.getException());
+			pluginLog.error(msg(status), status.getException());
 		} else if (severity == LogService.LOG_WARNING)
-			pluginLog.warn(status.getMessage(), status.getException());
+			pluginLog.warn(msg(status), status.getException());
 		else if (severity == LogService.LOG_INFO && pluginLog.isDebugEnabled())
-			pluginLog.debug(
-					status.getMessage() + (status.getServiceReference() != null ?" "+ status.getServiceReference() : ""),
-					status.getException());
+			pluginLog.debug(msg(status), status.getException());
 		else if (severity == LogService.LOG_DEBUG && pluginLog.isTraceEnabled())
-			pluginLog.trace(status.getMessage(), status.getException());
+			pluginLog.trace(msg(status), status.getException());
+	}
+
+	private String msg(LogEntry status) {
+		StringBuilder sb = new StringBuilder();
+		sb.append(status.getMessage());
+		ServiceReference<?> sr = status.getServiceReference();
+		if (sr != null) {
+			sb.append(' ');
+			String[] objectClasses = (String[]) sr.getProperty(Constants.OBJECTCLASS);
+			sb.append(arrayToString(objectClasses));
+			Object cn = sr.getProperty(NodeConstants.CN);
+			if (cn != null)
+				sb.append(" " + NodeConstants.CN + ": " + cn);
+			Object factoryPid = sr.getProperty(ConfigurationAdmin.SERVICE_FACTORYPID);
+			if (factoryPid != null)
+				sb.append(" " + ConfigurationAdmin.SERVICE_FACTORYPID + ": " + factoryPid);
+//			else {
+//				Object servicePid = sr.getProperty(Constants.SERVICE_PID);
+//				if (servicePid != null)
+//					sb.append(" " + Constants.SERVICE_PID + ": " + servicePid);
+//			}
+			// servlets
+			Object whiteBoardPattern = sr.getProperty(KernelConstants.WHITEBOARD_PATTERN_PROP);
+			if (whiteBoardPattern != null)
+				sb.append(" " + KernelConstants.WHITEBOARD_PATTERN_PROP + ": "
+						+ arrayToString((String[]) whiteBoardPattern));
+			// RWT
+			Object contextName = sr.getProperty(KernelConstants.CONTEXT_NAME_PROP);
+			if (contextName != null)
+				sb.append(" " + KernelConstants.CONTEXT_NAME_PROP + ": " + contextName);
+			
+			// user directories
+			Object baseDn = sr.getProperty(UserAdminConf.baseDn.name());
+			if (baseDn != null)
+				sb.append(" " + UserAdminConf.baseDn.name() + ": " + baseDn);
+		}
+		return sb.toString();
+	}
+
+	private String arrayToString(Object[] arr) {
+		StringBuilder sb = new StringBuilder();
+		sb.append('{');
+		for (int i = 0; i < arr.length; i++) {
+			if (i != 0)
+				sb.append(',');
+			sb.append(arr[i]);
+		}
+		sb.append('}');
+		return sb.toString();
 	}
 
 	//
@@ -153,7 +205,7 @@ class NodeLogger implements ArgeoLogger, LogListener {
 	public synchronized void register(ArgeoLogListener listener, Integer numberOfPreviousEvents) {
 		String username = CurrentUser.getUsername();
 		if (username == null)
-			throw new ArgeoException("Only authenticated users can register a log listener");
+			throw new CmsException("Only authenticated users can register a log listener");
 
 		if (!userListeners.containsKey(username)) {
 			List<ArgeoLogListener> lst = Collections.synchronizedList(new ArrayList<ArgeoLogListener>());
@@ -182,9 +234,9 @@ class NodeLogger implements ArgeoLogger, LogListener {
 		if (username == null)// FIXME
 			return;
 		if (!userListeners.containsKey(username))
-			throw new ArgeoException("No user listeners " + listener + " registered for user " + username);
+			throw new CmsException("No user listeners " + listener + " registered for user " + username);
 		if (!userListeners.get(username).contains(listener))
-			throw new ArgeoException("No user listeners " + listener + " registered for user " + username);
+			throw new CmsException("No user listeners " + listener + " registered for user " + username);
 		userListeners.get(username).remove(listener);
 		if (userListeners.get(username).isEmpty())
 			userListeners.remove(username);