Author: [email protected]
Date: Fri Jun 1 14:07:13 2012
New Revision: 2429
Log:
[AMDATUAUTH-163] Fixed proper log handler messages
Modified:
trunk/amdatu-auth/tools/loghandler/src/main/java/org/amdatu/auth/tools/loghandler/service/ConsoleLogHandler.java
trunk/amdatu-auth/tools/loghandler/src/main/java/org/amdatu/auth/tools/loghandler/service/JdkLogForwarder.java
Modified:
trunk/amdatu-auth/tools/loghandler/src/main/java/org/amdatu/auth/tools/loghandler/service/ConsoleLogHandler.java
==============================================================================
---
trunk/amdatu-auth/tools/loghandler/src/main/java/org/amdatu/auth/tools/loghandler/service/ConsoleLogHandler.java
(original)
+++
trunk/amdatu-auth/tools/loghandler/src/main/java/org/amdatu/auth/tools/loghandler/service/ConsoleLogHandler.java
Fri Jun 1 14:07:13 2012
@@ -74,9 +74,19 @@
public void logged(LogEntry entry) {
if (entry.getLevel() <= m_minLogLevel) {
+ String symbName = entry.getBundle().getSymbolicName();
+ String msg;
+ if ("org.amdatu.auth.tools.loghandler".equals(symbName)) {
+ // This is a log message logged by the JdkLogForwarder service
from this bundle.
+ // In this case, do not append the origin bundle as this is
already appended by
+ // the JdkLogForwarder.
+ msg = entry.getMessage();
+ }
+ else {
+ msg = entry.getMessage() + " [" + symbName + "]";
+ }
String levelName = LOG_LEVELS.get(entry.getLevel());
- System.out.println("[" + getTimestamp() + "] " + levelName + ": "
+ entry.getMessage() + " ["
- + entry.getBundle().getSymbolicName() + "]");
+ System.out.println("[" + getTimestamp() + "] " + levelName + ": "
+ msg);
if (entry.getException() != null) {
System.out.println(entry.getException().getMessage());
entry.getException().printStackTrace();
Modified:
trunk/amdatu-auth/tools/loghandler/src/main/java/org/amdatu/auth/tools/loghandler/service/JdkLogForwarder.java
==============================================================================
---
trunk/amdatu-auth/tools/loghandler/src/main/java/org/amdatu/auth/tools/loghandler/service/JdkLogForwarder.java
(original)
+++
trunk/amdatu-auth/tools/loghandler/src/main/java/org/amdatu/auth/tools/loghandler/service/JdkLogForwarder.java
Fri Jun 1 14:07:13 2012
@@ -99,15 +99,15 @@
if (record.getLevel() == Level.OFF) {
return;
}
-
+ String loggername = " [" + record.getLoggerName() + "]";
if (record.getThrown() != null) {
m_log.log(getToOsgiLogLevel(record.getLevel()),
- record.getMessage(), record.getThrown());
+ record.getMessage() + loggername, record.getThrown());
}
else {
m_log
.log(getToOsgiLogLevel(record.getLevel()), record
- .getMessage());
+ .getMessage() + loggername);
}
}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
