[prev in list] [next in list] [prev in thread] [next in thread] 

List:       slide-dev
Subject:    cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav WebdavServlet.java
From:       pnever () apache ! org
Date:       2002-12-18 16:08:27
[Download RAW message or body]

pnever      2002/12/18 08:08:27

  Modified:    src/webdav/server/org/apache/slide/webdav WebdavServlet.java
  Log:
  Removed request logging. Logging is now provided through logging filters
  (e.g. org.apache.slide.webdav.filter.LogFilter)
  
  Revision  Changes    Path
  1.51      +15 -84    \
jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java  
  Index: WebdavServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- WebdavServlet.java	21 Oct 2002 12:07:10 -0000	1.50
  +++ WebdavServlet.java	18 Dec 2002 16:08:27 -0000	1.51
  @@ -65,8 +65,8 @@
   
   import java.io.IOException;
   import java.net.URL;
  -import java.security.Principal;
  -
  +import java.text.SimpleDateFormat;
  +import java.util.Date;
   import javax.servlet.RequestDispatcher;
   import javax.servlet.ServletConfig;
   import javax.servlet.ServletException;
  @@ -74,7 +74,6 @@
   import javax.servlet.http.HttpServlet;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
  -
   import org.apache.slide.authenticate.SecurityToken;
   import org.apache.slide.common.Domain;
   import org.apache.slide.common.DomainInitializationFailedError;
  @@ -84,15 +83,10 @@
   import org.apache.slide.structure.LinkedObjectNotFoundException;
   import org.apache.slide.structure.ObjectNotFoundException;
   import org.apache.slide.util.logger.Logger;
  -import org.apache.slide.webdav.logger.XHttpServletRequestFacade;
  -import org.apache.slide.webdav.logger.XHttpServletResponseFacade;
  -import org.apache.slide.webdav.logger.XHttpServletResponseSimpleFacade;
  -import org.apache.slide.webdav.logger.XMLTestCaseGenerator;
  -import org.apache.slide.webdav.method.*;
   import org.apache.slide.webdav.util.DirectoryIndexGenerator;
   import org.apache.slide.webdav.util.WebdavUtils;
  -import org.apache.util.WebdavStatus;
   import org.apache.util.DOMUtils;
  +import org.apache.util.WebdavStatus;
   
   /**
    * The WebDAV servlet. It is responsible for dispatching incoming requests to
  @@ -170,6 +164,10 @@
       protected void service (HttpServletRequest req, HttpServletResponse resp)
           throws ServletException, IOException {
           
  +        SimpleDateFormat sdf = new SimpleDateFormat();
  +        if( token.getLogger().isEnabled(LOG_CHANNEL, Logger.DEBUG) )
  +            token.getLogger().log("==> "+req.getMethod()+" start: "+sdf.format(new \
Date(System.currentTimeMillis()))+" ["+Thread.currentThread().getName()+"]", \
LOG_CHANNEL, Logger.DEBUG);  +        
           WebdavServletConfig config = (WebdavServletConfig)getServletConfig();
           try
           {
  @@ -185,27 +183,6 @@
                       (new SecurityToken(this), namespaceName);
               }
               
  -            // if logging for the request/response is required initialise the
  -            // facades
  -            try
  -            {
  -                if (token.getLogger().isEnabled
  -                    \
                ("org.apache.slide.webdav.WebdavServlet.requestResponseLogger",
  -                     Logger.DEBUG)) {
  -                    if (req != null)
  -                        req = new XHttpServletRequestFacade(req);
  -                    if (resp != null)
  -                        resp = new XHttpServletResponseFacade(resp);
  -                } else {
  -                    if (resp != null)
  -                        resp = new XHttpServletResponseSimpleFacade(resp);
  -                }
  -            }
  -            catch (Throwable ex)
  -            {
  -                // ignore logging errors
  -            }
  -            
               resp.setStatus(WebdavStatus.SC_OK);
               
               String methodName = req.getMethod();
  @@ -224,56 +201,6 @@
                       method.run(req, resp);
                   }
               }
  -            
  -            // if logging for the request/response is required
  -            // perform the logging
  -            try
  -            {
  -                if (token.getLogger().isEnabled
  -                    \
                ("org.apache.slide.webdav.WebdavServlet.requestResponseLogger",
  -                     Logger.DEBUG)) {
  -                    XMLTestCaseGenerator xmlGen = new XMLTestCaseGenerator
  -                        ((XHttpServletRequestFacade)req,
  -                         (XHttpServletResponseFacade)resp);
  -                    xmlGen.setThreadName(Thread.currentThread().getName());
  -                    token.getLogger().log
  -                        (xmlGen.toString(),
  -                         \
                "org.apache.slide.webdav.WebdavServlet.requestResponseLogger",
  -                         Logger.DEBUG);
  -                }
  -            }
  -            catch (Throwable ex)
  -            {
  -                // ignore logging errors
  -            }
  -
  -            try
  -            {
  -                token.getLogger().log
  -                    (req.getMethod()
  -                     + ( (resp instanceof XHttpServletResponseFacade)
  -                         ? (" = " + ((XHttpServletResponseFacade)resp)
  -                            .getStatus()
  -                            + " " + (WebdavStatus.getStatusText
  -                                     (((XHttpServletResponseFacade)resp)
  -                                      .getStatus())))
  -                         : (" = " + ((XHttpServletResponseSimpleFacade)resp)
  -                            .getStatus()
  -                            + " " + (WebdavStatus.getStatusText
  -                                     (((XHttpServletResponseSimpleFacade)resp)
  -                                      .getStatus()))) )
  -                     + " (time: " + (System.currentTimeMillis() - startTime)
  -                     + " ms)"
  -                     + " URI = "
  -                     + WebdavUtils.getRelativePath
  -                     (req, (WebdavServletConfig)getServletConfig()),
  -                     LOG_CHANNEL, Logger.INFO);
  -            }
  -            catch (Throwable ex)
  -            {
  -                // ignore logging errors
  -            }
  -            
           } catch (WebdavException e) {
               // There has been an error somewhere ...
               token.getLogger().log(e,LOG_CHANNEL, Logger.ERROR);
  @@ -282,6 +209,10 @@
               // If something goes really wrong ...
               token.getLogger().log(e,LOG_CHANNEL, Logger.ERROR);
               try { resp.sendError(WebdavStatus.SC_INTERNAL_SERVER_ERROR); } catch \
(Throwable ex) { }  +        }
  +        finally {
  +            if( token.getLogger().isEnabled(LOG_CHANNEL, Logger.DEBUG) )
  +                token.getLogger().log("<== "+req.getMethod()+" end: \
"+sdf.format(new Date(System.currentTimeMillis()))+" \
["+Thread.currentThread().getName()+"]", LOG_CHANNEL, Logger.DEBUG);  }
   
       }
  
  
  

--
To unsubscribe, e-mail:   <mailto:slide-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:slide-dev-help@jakarta.apache.org>


[prev in list] [next in list] [prev in thread] [next in thread]