You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@apache.org on 2001/07/25 01:21:09 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves AccessLogValve.java
craigmcc 01/07/24 16:21:09
Modified: catalina/src/share/org/apache/catalina/valves
AccessLogValve.java
Log:
Include the query string (if any) in the access log output, in a manner
consistent with logging done by web servers like Apache.
PR: Bugzilla #2763
Submitted by: colin@london.virgin.net
Revision Changes Path
1.8 +21 -6 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java
Index: AccessLogValve.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AccessLogValve.java 2001/07/22 20:25:15 1.7
+++ AccessLogValve.java 2001/07/24 23:21:09 1.8
@@ -126,7 +126,7 @@
*
* @author Craig R. McClanahan
* @author Jason Brittain
- * @version $Revision: 1.7 $ $Date: 2001/07/22 20:25:15 $
+ * @version $Revision: 1.8 $ $Date: 2001/07/24 23:21:09 $
*/
public final class AccessLogValve
@@ -488,6 +488,10 @@
result.append(hreq.getMethod());
result.append(space);
result.append(hreq.getRequestURI());
+ if (hreq.getQueryString() != null) {
+ result.append('?');
+ result.append(hreq.getQueryString());
+ }
result.append(space);
result.append(hreq.getProtocol());
result.append("\" ");
@@ -677,11 +681,22 @@
else
value = "";
} else if (pattern == 'r') {
- if (hreq != null)
- value = hreq.getMethod() + space + hreq.getRequestURI()
- + space + hreq.getProtocol();
- else
- value = "- - " + req.getProtocol();
+ StringBuffer sb = new StringBuffer();
+ if (hreq != null) {
+ sb.append(hreq.getMethod());
+ sb.append(space);
+ sb.append(hreq.getRequestURI());
+ if (hreq.getQueryString() != null) {
+ sb.append('?');
+ sb.append(hreq.getQueryString());
+ }
+ sb.append(space);
+ sb.append(hreq.getProtocol());
+ } else {
+ sb.append("- - ");
+ sb.append(req.getProtocol());
+ }
+ value = sb.toString();
} else if (pattern == 's') {
if (hres != null)
value = "" + ((HttpResponse) response).getStatus();