Author: kkolinko
Date: Sat Aug 25 15:39:45 2012
New Revision: 1377312
URL: http://svn.apache.org/viewvc?rev=1377312&view=rev
Log:
Merged revision 1377311 from tomcat/trunk:
Mention the %{xxx}t pattern in AccessLogValve javadoc.
Correct markup in valve.xml. (<ul> cannot be nested in <p>)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1377311
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1377312&r1=1377311&r2=1377312&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Sat Aug 25 15:39:45 2012
@@ -110,6 +110,8 @@ import org.apache.tomcat.util.buf.B2CCon
* <li><code>%{xxx}c</code> for a specific cookie
* <li><code>%{xxx}r</code> xxx is an attribute in the ServletRequest
* <li><code>%{xxx}s</code> xxx is an attribute in the HttpSession
+ * <li><code>%{xxx}t</code> xxx is an enhanced SimpleDateFormat pattern
+ * (see Configuration Reference document for details on supported time
patterns)
* </ul>
*
* <p>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml?rev=1377312&r1=1377311&r2=1377312&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml Sat Aug 25 15:39:45 2012
@@ -268,24 +268,24 @@
</p>
<p>All formats supported by SimpleDateFormat are allowed in
<code>%{xxx}t</code>.
- In addition the following extensions have been added:
+ In addition the following extensions have been added:</p>
<ul>
<li><b><code>sec</code></b> - number of seconds since the epoch</li>
<li><b><code>msec</code></b> - number of milliseconds since the epoch</li>
<li><b><code>msec_frac</code></b> - millisecond fraction</li>
</ul>
- These formats can not be mixed with SimpleDateFormat formats in the same
format
+ <p>These formats can not be mixed with SimpleDateFormat formats in the
same format
token.</p>
<p>Furthermore one can define whether to log the timestamp for the request
start
- time or the response finish time:
+ time or the response finish time:</p>
<ul>
<li><b><code>begin</code></b> or prefix <b><code>begin:</code></b> chooses
the request start time</li>
<li><b><code>end</code></b> or prefix <b><code>end:</code></b> chooses
the response finish time</li>
</ul>
- By adding multiple <code>%{xxx}t</code> tokens to the pattern, one can
+ <p>By adding multiple <code>%{xxx}t</code> tokens to the pattern, one can
also log both timestamps.</p>
<p>The shorthand pattern <code>pattern="common"</code>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
