Changeset 1577

Timestamp:

12/07/09 15:44:44 (2 years ago)

Author:

amandel

Message:

Allow to add context parameters to the log records via LogThreadContext?.
The parameters are added as logging parameters with a CTX~ prefix.

Location:

trunk

Files:

• config/build-test.xml (modified) (2 diffs)
• src/java/org/jcoderz/commons/LogFormatter.java (modified) (1 diff)
• src/java/org/jcoderz/commons/LogThreadContext.java (added)
• src/java/org/jcoderz/commons/LoggableImpl.java (modified) (5 diffs)

trunk/config/build-test.xml

@@ -212 +212 @@
             depends="test-compile, instrument, test-single-local-nodeps"
             description="Run a single JUnit test suite"/>
-    <target name="test-single-local-nodeps" if="testcase, junit.present">
+    <target name="test-single-local-nodeps" if="testcase">
         <mkdir dir="${build.dir}/report/junit"/>
         <junit printsummary="yes" haltonfailure="no"
@@ -221 +221 @@
             <sysproperty key="basedir" value="${base.dir}"/>
             <sysproperty key="java.util.logging.config.file"
-                    value="${base.dir}/src/etc/fawkez-logging.properties"/>
+                    file="${base.dir}/src/etc/fawkez-logging.properties"/>
             <sysproperty key="org.xml.sax.driver"
                     value="org.apache.xerces.parsers.SAXParser"/>

trunk/src/java/org/jcoderz/commons/LogFormatter.java

@@ -121 +121 @@
     * @param sb the StringBuffer where to append the formatted log record
     * @param record the log record to format
-    * @param trackingIdSequence a list collectiong all tracking ids of messages
+    * @param trackingIdSequence a list collecting all tracking ids of messages
     * being formatted by one call.
     */

trunk/src/java/org/jcoderz/commons/LoggableImpl.java

@@ -46 +46 @@
 import java.util.Random;
 import java.util.Set;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 
@@ -126 +127 @@
    public static final String GROUP_NAME_PARAMETER_NAME = "_GROUP";
 
+   /** Context parameter values prefix. */
+   public static final String CONTEXT_PARAMETER_PREFIX = "CTX~";
+   
    /** This nodes id. */
    public static final String NODE_ID = getStaticNodeId();
@@ -256 +260 @@
       mOuter = outer;
       initInternalParameters();
+      initThreadContextParameters();
    }
 
@@ -301 +306 @@
       initCause(cause);
       initInternalParameters();
+      initThreadContextParameters();
    }
 
@@ -513 +519 @@
    }
 
+   private final void initThreadContextParameters ()
+   {
+       final Iterator i = LogThreadContext.get().entrySet().iterator();
+       while (i.hasNext())
+       {
+           final Entry entry = (Entry) i.next();
+           addParameter(
+               CONTEXT_PARAMETER_PREFIX + entry.getKey(), 
+               String.valueOf(entry.getValue()));
+       }
+   }
+   
    private final void getSource ()
    {