From 04dfafe19f0d3687d0f0b3e51d2d5bf3d19b58bf Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Wed, 07 Mar 2007 23:38:55 +0000
Subject: [PATCH] Enable AspectJ weaving for the new debug logging framework: - This commit does not allow for configuring the debug logger over protocol. It can only be configured on server startup using properties. - The settings specified during startup will remain in effect for the duration of the server. - All messages are printed to standard out. - Weaving could be turned off with the -DDEBUG_BUILD=false property when building the server. - By default, the debug logger is off on server startup. It could be enabled by using the -Dorg.opends.server.debug.enabled=true. - Debug targets may be defined with the -Dorg.opends.server.debug.target property. The syntax of this property can be found on the opends.dev.java.net documentation section. - Debug logging is turned on by default on unit tests and printed on test failure.  - Default debug target for unit tests could be changed by using the -Dorg.opends.test.debug.target property.

---
 opends/src/server/org/opends/server/loggers/debug/DebugLogFormatter.java |   40 ++++++++++++++++++++++++++++++----------
 1 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/opends/src/server/org/opends/server/loggers/debug/DebugLogFormatter.java b/opends/src/server/org/opends/server/loggers/debug/DebugLogFormatter.java
index 8a9b29a..13530dd 100644
--- a/opends/src/server/org/opends/server/loggers/debug/DebugLogFormatter.java
+++ b/opends/src/server/org/opends/server/loggers/debug/DebugLogFormatter.java
@@ -30,6 +30,7 @@
 import org.opends.server.loggers.LogRecord;
 
 import java.util.Locale;
+import java.util.Map;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 
@@ -66,25 +67,44 @@
       buf.append(_timestamper.format(dlr.getTimestamp()));
       buf.append(" ");
 
-      // Emit the debug level.
-      buf.append(dlr.getLevel());
+      // Emit the seq num
+      buf.append(dlr.getSequenceNumber());
       buf.append(" ");
 
-      // Emit thread info.
-      buf.append(dlr.getThreadName());
-      buf.append("(");
-      buf.append(dlr.getThreadID());
-      buf.append(") ");
-
       // Emit debug category.
       buf.append(dlr.getCategory());
       buf.append(" ");
 
+      // Emit the debug level.
+      buf.append(dlr.getLevel());
+      buf.append(" ");
+
+      // Emit thread info.
+      buf.append("thread={");
+      buf.append(dlr.getThreadName());
+      buf.append("(");
+      buf.append(dlr.getThreadID());
+      buf.append(")} ");
+
+      if(dlr.getThreadProperties() != null)
+      {
+        buf.append("threadDetail={");
+        for(Map.Entry entry : dlr.getThreadProperties().entrySet())
+        {
+          buf.append(entry.getKey());
+          buf.append("=");
+          buf.append(entry.getValue());
+          buf.append(" ");
+        }
+        buf.append("} ");
+      }
+
       // Emit method info.
+      buf.append("signature={");
       buf.append(dlr.getSignature());
       buf.append(" @ ");
       buf.append(dlr.getSourceLocation());
-      buf.append(" ");
+      buf.append("} ");
 
       // Emit message.
       buf.append(dlr.getMessage());
@@ -92,7 +112,7 @@
       // Emit Stack Trace.
       if(dlr.getStackTrace() != null)
       {
-        buf.append("\nStack Trace\n");
+        buf.append("\nStack Trace:\n");
         buf.append(dlr.getStackTrace());
       }
 

--
Gitblit v1.10.0