You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by lu...@apache.org on 2005/01/25 11:41:41 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/filter LogFilter.java
luetzkendorf 2005/01/25 02:41:41
Modified: src/webdav/server/org/apache/slide/webdav/filter
LogFilter.java
Log:
new log option %n (traNsaction id, aka locktoken)
Revision Changes Path
1.14 +14 -6 jakarta-slide/src/webdav/server/org/apache/slide/webdav/filter/LogFilter.java
Index: LogFilter.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/filter/LogFilter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- LogFilter.java 5 Aug 2004 14:43:34 -0000 1.13
+++ LogFilter.java 25 Jan 2005 10:41:40 -0000 1.14
@@ -137,6 +137,12 @@
if( contentlength == null )
contentlength = "-";
+ String transaction = req.getHeader("Transaction");
+ if (transaction == null && req.getMethod().equals("UNLOCK")) {
+ transaction = req.getHeader("Lock-Token");
+ }
+ if (transaction == null) transaction = "-";
+
// next please!
chain.doFilter( req, resp );
@@ -150,7 +156,7 @@
long end = System.currentTimeMillis();
logLine( (end-start), status, thread, method, datetime, uri, path, contentlength, principal,
- message, detail, useragent);
+ message, detail, useragent, transaction);
}
/**
@@ -166,7 +172,7 @@
private void logLine(long elapsed, int status,
String thread, String method, String datetime, String uri,
String path, String contentlength, String principal,
- String message, String detail, String useragent)
+ String message, String detail, String useragent, String transaction)
throws IOException
{
@@ -196,6 +202,8 @@
if( i >= 0 ) b.replace( i, i+2, contentlength );
i = b.toString().indexOf("%A");
if( i >= 0 ) b.replace( i, i+2, useragent );
+ i = b.toString().indexOf("%n");
+ if( i >= 0 ) b.replace( i, i+2, transaction );
if( outputToConsole )
System.out.println( b.toString() );
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org