bloritsch    01/05/09 09:43:42

  Modified:    lib      Tag: xml-cocoon2 logkit.jar
               src/org/apache/cocoon/servlet Tag: xml-cocoon2
                        CocoonServlet.java
  Log:
  Upgrade Logger and CocoonServlet to use AvalonFormatter.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.12  +51 -52    xml-cocoon/lib/Attic/logkit.jar
  
        <<Binary file>>
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.4.95  +14 -4     
xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java
  
  Index: CocoonServlet.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java,v
  retrieving revision 1.1.4.94
  retrieving revision 1.1.4.95
  diff -u -r1.1.4.94 -r1.1.4.95
  --- CocoonServlet.java        2001/05/07 15:21:11     1.1.4.94
  +++ CocoonServlet.java        2001/05/09 16:43:37     1.1.4.95
  @@ -44,6 +44,7 @@
   import org.apache.log.Logger;
   import org.apache.log.Priority;
   import org.apache.log.filter.PriorityFilter;
  +import org.apache.log.format.AvalonFormatter;
   import org.apache.log.output.FileOutputLogTarget;
   import org.apache.log.output.ServletOutputLogTarget;
   import org.xml.sax.SAXException;
  @@ -56,7 +57,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Nicola Ken Barozzi</a> Aisa
    * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
  - * @version CVS $Revision: 1.1.4.94 $ $Date: 2001/05/07 15:21:11 $
  + * @version CVS $Revision: 1.1.4.95 $ $Date: 2001/05/09 16:43:37 $
    */
   
   public class CocoonServlet extends HttpServlet {
  @@ -273,14 +274,23 @@
               if (logName == null) {
                   logName = "cocoon.log";
               }
  -            final String path = logDir + logName ;
  +            final String path = logDir + logName;
  +            final AvalonFormatter formatter = new AvalonFormatter();
  +            formatter.setFormat( "%7.7{priority} %5.5{time}   
[%8.8{category}] " +
  +                                 "(%{context}): %{message}\\n%{throwable}" );
   
               this.log = 
Hierarchy.getDefaultHierarchy().getLoggerFor("cocoon");
               this.log.setPriority(logPriority);
   
  +            FileOutputLogTarget fileTarget = new FileOutputLogTarget(path);
  +            ServletOutputLogTarget servTarget = new 
ServletOutputLogTarget(context);
  +
  +            fileTarget.setFormatter(formatter);
  +            servTarget.setFormatter(formatter);
  +
               PriorityFilter filter = new PriorityFilter(Priority.ERROR);
  -            filter.addTarget( new ServletOutputLogTarget(context) );
  -            LogTarget[] targets = new LogTarget[] { new 
FileOutputLogTarget(path), filter };
  +            filter.addTarget( servTarget );
  +            LogTarget[] targets = new LogTarget[] { fileTarget, filter };
               this.log.setLogTargets( targets );
           } catch (Exception e) {
               Hierarchy.getDefaultHierarchy().log("Could not set up Cocoon 
Logger, will use screen instead", e);
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to