cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves mbeans-descriptors.xml
billbarker2004/07/13 23:19:32 Modified:catalina/src/share/org/apache/catalina/connector mbeans-descriptors.xml catalina/src/share/org/apache/catalina/core mbeans-descriptors.xml catalina/src/share/org/apache/catalina/loader mbeans-descriptors.xml catalina/src/share/org/apache/catalina/realm mbeans-descriptors.xml catalina/src/share/org/apache/catalina/session mbeans-descriptors.xml catalina/src/share/org/apache/catalina/startup mbeans-descriptors.xml catalina/src/share/org/apache/catalina/valves mbeans-descriptors.xml Log: Removing the 'debug' property from the mbeans. Revision ChangesPath 1.2 +0 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/mbeans-descriptors.xml Index: mbeans-descriptors.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/mbeans-descriptors.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mbeans-descriptors.xml23 Jun 2004 08:24:58 - 1.1 +++ mbeans-descriptors.xml14 Jul 2004 06:19:31 - 1.2 @@ -57,10 +57,6 @@ description="Timeout value on the incoming connection during request processing" type="int"/> - - 1.30 +0 -40 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml Index: mbeans-descriptors.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- mbeans-descriptors.xml7 Jun 2004 15:30:06 - 1.29 +++ mbeans-descriptors.xml14 Jul 2004 06:19:31 - 1.30 @@ -109,10 +109,6 @@ type="java.lang.String" writeable="false"/> - - - - @@ -430,10 +422,6 @@ type="java.lang.String" writeable="false"/> - - - - @@ -502,10 +486,6 @@ type="java.lang.String" writeable="false"/> - - - - @@ -625,10 +601,6 @@ type="java.lang.String" writeable="false"/> - - - - @@ -678,10 +646,6 @@ group="Service" type="org.apache.catalina.core.StandardService"> - - @@ -808,10 +772,6 @@ type="java.lang.String" writeable="false"/> - - 1.4 +0 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/mbeans-descriptors.xml Index: mbeans-descriptors.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/mbeans-descriptors.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mbeans-descriptors.xml2 Mar 2004 12:31:57 - 1.3 +++ mbeans-descriptors.xml14 Jul 2004 06:19:31 - 1.4 @@ -13,10 +13,6 @@ type="java.lang.String" writeable="false"/> - - - - - - - - - - - - - - - - - - - - @@ -53,9 +47,6 @@ description="The Java class name of the Context implementation we should use" type="java.lang.String"/> - 1.6 +0 -28 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml Index: mbeans-descriptors.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mbeans-descriptors.xml19 Jul 2003 14:30:07 - 1.5 +++ mbeans-descriptors.xml14 Jul 2004 06:19:32 - 1.6 @@ -12,10 +12,6 @@ type="java.lang.String" writeable="false"/
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves mbeans-descriptors.xml
billbarker2003/06/10 20:10:01 Modified:catalina/src/share/org/apache/catalina/valves mbeans-descriptors.xml Log: Since there is no longer a CertificatesValve, there is no reason to have an MBean for it. Revision ChangesPath 1.4 +0 -21 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml Index: mbeans-descriptors.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mbeans-descriptors.xml4 Jun 2003 16:58:21 - 1.3 +++ mbeans-descriptors.xml11 Jun 2003 03:10:01 - 1.4 @@ -55,27 +55,6 @@ type="java.lang.String"/> - - - - - - - - - -
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves mbeans-descriptors.xml ExtendedAccessLogValve.java AccessLogValve.java
funkman 2003/06/04 09:58:21
Modified:catalina/src/share/org/apache/catalina/valves
mbeans-descriptors.xml ExtendedAccessLogValve.java
AccessLogValve.java
Log:
Fix bz - 20380 AccessLogValve incorrectly calculates timezone
Enc bz - 16374 Date in file name configurable
Enc bz - 16400 Allow logging to be conditional
Revision ChangesPath
1.3 +13 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mbeans-descriptors.xml1 Jun 2003 20:57:00 - 1.2
+++ mbeans-descriptors.xml4 Jun 2003 16:58:21 - 1.3
@@ -38,13 +38,21 @@
type="boolean"/>
+
+
+
+
+
+
%r - First line of the request
* %s - HTTP status code of the response
- * %S - User session ID
+ * %S - User session ID
* %t - Date and time, in Common Log Format format
* %u - Remote user that was authenticated
* %U - Requested URL path
* %v - Local server name
* %D - Time taken to process the request, in millis
- *
+ * %T - Time taken to process the request, in seconds
+ *
* In addition, the caller can specify one of the following aliases for
* commonly utilized patterns:
*
* common - %h %l %u %t "%r" %s %b
- * combined -
+ * combined -
* %h %l %u %t "%r" %s %b "%{Referer}i" "%{User-Agent}i"
*
*
@@ -140,6 +142,13 @@
*
*
*
+ *
+ * Conditional logging is also supported. This can be done with the
+ * condition property.
+ * If the value returned from ServletRequest.getAttribute(condition)
+ * yields a non-null value. The logging will be skipped.
+ *
+ *
* @author Craig R. McClanahan
* @author Jason Brittain
* @version $Revision$ $Date$
@@ -227,12 +236,12 @@
* The prefix that is added to log file filenames.
*/
private String prefix = "access_log.";
-
+
/**
* Should we rotate our log file? Default is true (like old behavior)
*/
-private boolean rotatable = true;
+private boolean rotatable = true;
/**
@@ -282,6 +291,12 @@
/**
+ * Time taken formatter for 3 decimal places.
+ */
+ private DecimalFormat timeTakenFormatter = null;
+
+
+/**
* A date formatter to format a Date into a year string in the format
* "".
*/
@@ -326,6 +341,17 @@
private long rotationLastChecked = 0L;
+/**
+ * Are we doing conditional logging. default false.
+ */
+private String condition = null;
+
+
+/**
+ * Date format to place in log file name. Use at your own risk!
+ */
+private String fileDateFormat = null;
+
// - Properties
@@ -425,21 +451,21 @@
* Should we rotate the logs
*/
public boolean isRotatable() {
-
+
return rotatable;
-
+
}
-
-
+
+
/**
* Set the value is we should we rotate the logs
*
* @param rotatable true is we should rotate.
*/
public void setRotatable(boolean rotatable) {
-
+
this.rotatable = rotatable;
-
+
}
@@ -487,6 +513,45 @@
}
+/**
+ * Return whether the attribute name to look for when
+ * performing conditional loggging. If null, every
+ * request is logged.
+ */
+public String getCondition() {
+
+return condition;
+
+}
+
+
+/**
+ * Set the ServletRequest.attribute to look for to perform
+ * conditional logging. Set to null to log everything.
+ *
+ * @param condition Set to null to log everything
+ */
+public void setCondition(String condition) {
+
+this.condition = condition;
+
+}
+
+/**
+ * Return the date format date based log rotation.
+ */
+public String getFileDateFormat() {
+return fileDateFormat;
+}
+
+
+/**
+ * Set the date format date based log rotation.
+ */
+public void setFileDateFormat(String fileDateFormat) {
+this.fileDateFormat = fileDateFormat;
+}
+
// - Public Methods
@@ -514,6 +579,12 @@
long t2=System.currentTimeMillis();
long time=t2-t1;
+if (condition!=null &&
+null!=request.getRequest().getAt
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves mbeans-descriptors.xml
costin 2003/03/16 22:45:33 Added: catalina/src/share/org/apache/catalina/core mbeans-descriptors.xml catalina/src/share/org/apache/catalina/valves mbeans-descriptors.xml Log: Moved from mbeans. Modeler can pick them up automatically ( using the package name of the component ). I did a bit of reindentation - my emacs is not very friendly to the original style and I don't know how to set it to indent on the "=" :-) Revision ChangesPath 1.1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml Index: mbeans-descriptors.xml === 1.1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml Index: mbeans-descriptors.xml === - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
