Author: bpapez
Date: Wed Jan 2 12:18:05 2008
New Revision: 19438
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19438&repname=
=3Djahia
Log:
stop using and instantiating SimpleDateFormat on each request
Modified:
branches/JAHIA-4-1-BRANCH/src/java/org/apache/slide/webdav/JahiaWebdavS=
ervlet.java
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/apache/slide/webdav/JahiaW=
ebdavServlet.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/apache/slide/webdav/JahiaWebdavServlet.java&rev=3D19438&r=
epname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/src/java/org/apache/slide/webdav/JahiaWebdavS=
ervlet.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/apache/slide/webdav/JahiaWebdavS=
ervlet.java Wed Jan 2 12:18:05 2008
@@ -24,8 +24,6 @@
package org.apache.slide.webdav;
=
import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
=
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletConfig;
@@ -84,7 +82,7 @@
=
public static final String ATTRIBUTE_NAME =3D
"org.apache.slide.NamespaceAccessToken";
-
+ =
/**
* Directory browsing enabled.
*/
@@ -124,11 +122,14 @@
resp.sendError(HttpServletResponse.SC_NOT_FOUND);
return;
}
-
- SimpleDateFormat sdf =3D new SimpleDateFormat();
- if( token.getLogger().isEnabled(LOG_CHANNEL, Logger.DEBUG) )
- token.getLogger().log("=3D=3D> "+req.getMethod()+" start: "+sd=
f.format(new Date(System.currentTimeMillis()))+" ["+Thread.currentThread().=
getName()+"]", LOG_CHANNEL, Logger.DEBUG);
-
+ long start =3D System.currentTimeMillis();
+ String user =3D "guest";
+ if (req.getUserPrincipal()!=3D null) {
+ user =3D req.getUserPrincipal().getName();
+ }
+ if( token.getLogger().isEnabled(LOG_CHANNEL, Logger.INFO) )
+ token.getLogger().log("Webdav request ["+req.getMethod()+" "+r=
eq.getAttribute("slide_uri")+"] user=3D["+user+"]" , LOG_CHANNEL, Logger.I=
NFO);
+ =
Boolean isMs =3D (Boolean) req.getSession(true).getAttribute("isMs=
");
if (isMs =3D=3D null) {
isMs =3D Boolean.valueOf(req.getHeader("User-agent") !=3D null=
&& req.getHeader("User-agent").startsWith(HttpRequestWrapper.MICROSOFT_DAV=
));
@@ -198,8 +199,8 @@
try { resp.sendError(WebdavStatus.SC_INTERNAL_SERVER_ERROR); }=
catch (Throwable ex) { }
}
finally {
- if( token.getLogger().isEnabled(LOG_CHANNEL, Logger.DEBUG) )
- token.getLogger().log("<=3D=3D "+req.getMethod()+" end: "+=
sdf.format(new Date(System.currentTimeMillis()))+" ["+Thread.currentThread(=
).getName()+"]", LOG_CHANNEL, Logger.DEBUG);
+ if( token.getLogger().isEnabled(LOG_CHANNEL, Logger.INFO) )
+ token.getLogger().log("Processed ["+req.getMethod()+" "+re=
q.getAttribute("slide_uri")+"] in " + (System.currentTimeMillis()-start) + =
"ms", LOG_CHANNEL, Logger.INFO);
=
ConnectionDispenser.terminateConnection();
CacheFactory.getInstance().syncCachesNow();
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
