Return-Path: 
 <cocoon-cvs-return-3207-apmail-xml-cocoon-cvs-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org
Received: (qmail 88536 invoked by uid 500); 16 Aug 2001 14:05:53 -0000
Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cocoon-dev@xml.apache.org
list-help: <mailto:cocoon-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:cocoon-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:cocoon-cvs@xml.apache.org>
Delivered-To: mailing list cocoon-cvs@xml.apache.org
Received: (qmail 88523 invoked by uid 500); 16 Aug 2001 14:05:53 -0000
Delivered-To: apmail-xml-cocoon2-cvs@apache.org
Date: 16 Aug 2001 14:01:53 -0000
Message-ID: <20010816140153.20565.qmail@icarus.apache.org>
From: cziegeler@apache.org
To: xml-cocoon2-cvs@apache.org
Subject: cvs commit: xml-cocoon2/src/org/apache/cocoon/util/log
 ExtensiblePatternFormatter.java XMLCocoonLogFormatter.java
X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N

cziegeler    01/08/16 07:01:53

  Modified:    src/org/apache/cocoon/servlet CocoonServlet.java
               src/org/apache/cocoon/util/log
                        ExtensiblePatternFormatter.java
                        XMLCocoonLogFormatter.java
  Log:
  Updated formatter class to new LogKit and added unique request id
  
  Revision  Changes    Path
  1.30      +6 -3      xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java
  
  Index: CocoonServlet.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- CocoonServlet.java	2001/08/14 15:59:48	1.29
  +++ CocoonServlet.java	2001/08/16 14:01:53	1.30
  @@ -45,7 +45,7 @@
   import org.apache.cocoon.util.log.CocoonLogFormatter;
   import org.apache.cocoon.util.log.XMLCocoonLogFormatter;
   import org.apache.log.ContextMap;
  -import org.apache.log.Formatter;
  +import org.apache.log.format.Formatter;
   import org.apache.log.Hierarchy;
   import org.apache.log.LogTarget;
   import org.apache.log.Logger;
  @@ -64,7 +64,7 @@
    * @author <a href="mailto:nicolaken@supereva.it">Nicola Ken Barozzi</a> Aisa
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.29 $ $Date: 2001/08/14 15:59:48 $
  + * @version CVS $Revision: 1.30 $ $Date: 2001/08/16 14:01:53 $
    */
   
   public class CocoonServlet extends HttpServlet {
  @@ -528,9 +528,12 @@
               ContextMap ctxMap = org.apache.log.ContextMap.getCurrentContext();
               ctxMap.clear();
               // Add thread name (default content for empty context)
  -            ctxMap.set("threadName", Thread.currentThread().getName());
  +            String threadName = Thread.currentThread().getName();
  +            ctxMap.set("threadName", threadName);
               // Add the object model
               ctxMap.set("objectModel", env.getObjectModel());
  +            // Add a unique request id (threadName + currentTime
  +            ctxMap.set("request-id", threadName + System.currentTimeMillis());
   
               if (this.cocoon.process(env)) {
                   contentType = env.getContentType();
  
  
  
  1.5       +5 -2      xml-cocoon2/src/org/apache/cocoon/util/log/ExtensiblePatternFormatter.java
  
  Index: ExtensiblePatternFormatter.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/log/ExtensiblePatternFormatter.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ExtensiblePatternFormatter.java	2001/08/13 08:40:38	1.4
  +++ ExtensiblePatternFormatter.java	2001/08/16 14:01:53	1.5
  @@ -10,7 +10,10 @@
   
   import java.io.StringWriter;
   import java.util.Stack;
  -import org.apache.log.*;
  +import org.apache.log.Hierarchy;
  +import org.apache.log.LogEvent;
  +import org.apache.log.Priority;
  +import org.apache.log.format.Formatter;
   
   /**
    * A refactoring of <code>org.apache.log.format.PatternFormatter</code> that
  @@ -28,7 +31,7 @@
    *
    * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
    * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2001/08/13 08:40:38 $
  + * @version CVS $Revision: 1.5 $ $Date: 2001/08/16 14:01:53 $
    */
   public class ExtensiblePatternFormatter
       implements Formatter
  
  
  
  1.6       +24 -2     xml-cocoon2/src/org/apache/cocoon/util/log/XMLCocoonLogFormatter.java
  
  Index: XMLCocoonLogFormatter.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/log/XMLCocoonLogFormatter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XMLCocoonLogFormatter.java	2001/08/13 08:40:38	1.5
  +++ XMLCocoonLogFormatter.java	2001/08/16 14:01:53	1.6
  @@ -13,7 +13,10 @@
   import java.util.Map;
   import java.util.Stack;
   import java.util.StringTokenizer;
  -import org.apache.log.*;
  +import org.apache.log.ContextMap;
  +import org.apache.log.LogEvent;
  +import org.apache.log.Priority;
  +import org.apache.log.format.Formatter;
   import org.apache.avalon.framework.CascadingThrowable;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.environment.Request;
  @@ -48,7 +51,7 @@
    * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
    * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2001/08/13 08:40:38 $
  + * @version CVS $Revision: 1.6 $ $Date: 2001/08/16 14:01:53 $
    */
   public class XMLCocoonLogFormatter
   implements Formatter {
  @@ -92,6 +95,10 @@
       public String format( final LogEvent event ) {
           final StringBuffer sb = new StringBuffer();
           sb.append("<log-entry>").append(EOL);
  +        final String value = this.getRequestId(event.getContextMap());
  +        if (value != null) {
  +            sb.append("<request-id>").append(value).append("</request-id>").append(EOL);
  +        }
           for(int i = 0; i < this.types.length; i++) {
   
               switch(this.types[i]) {
  @@ -189,6 +196,21 @@
                       result = request.getRequestURI();
                   }
               }
  +        }
  +
  +        return result;
  +    }
  +
  +    /**
  +     * Find the request id that is being processed.
  +     */
  +    private String getRequestId(ContextMap ctxMap) {
  +        String result = null;
  +
  +        // Get URI from the the object model.
  +        if (ctxMap != null) {
  +            Object context = ctxMap.get("request-id");
  +            if (context != null) result = context.toString();
           }
   
           return result;
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org