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;
}
};
- @SuppressWarnings("unchecked")
public NodeLogger(LogReaderService lrs) {
Enumeration<LogEntry> logEntries = lrs.getLog();
while (logEntries.hasMoreElements())
//
// OSGi LOGGER
//
+ @SuppressWarnings("deprecation")
@Override
public void logged(LogEntry status) {
Log pluginLog = LogFactory.getLog(status.getBundle().getSymbolicName());
// 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) + ": " + status.getException());
} else if (severity == LogService.LOG_WARNING)
pluginLog.warn(msg(status), status.getException());
else if (severity == LogService.LOG_INFO && pluginLog.isDebugEnabled())
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(' ');