cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves ExtendedAccessLogValve.java
funkman 2003/12/22 12:37:25 Modified:catalina/src/share/org/apache/catalina/valves ExtendedAccessLogValve.java Log: port patch from 5 Revision ChangesPath 1.3 +7 -9 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java Index: ExtendedAccessLogValve.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ExtendedAccessLogValve.java 18 Jul 2003 01:24:45 - 1.2 +++ ExtendedAccessLogValve.java 22 Dec 2003 20:37:24 - 1.3 @@ -682,9 +682,8 @@ } /* Make sure date is correct */ -currentDate = new Date(); -fileDateFormatter = new SimpleDateFormat(-MM-dd); -dateStamp = dateFormatter.format(currentDate); +currentDate = new Date(System.currentTimeMillis()); +dateStamp = fileDateFormatter.format(currentDate); open(); return true; @@ -955,8 +954,7 @@ /* Make sure date is correct */ currentDate = new Date(System.currentTimeMillis()); -fileDateFormatter = new SimpleDateFormat(-MM-dd); -dateStamp = dateFormatter.format(currentDate); +dateStamp = fileDateFormatter.format(currentDate); open(); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves ExtendedAccessLogValve.java
funkman 2003/07/17 18:24:45
Modified:catalina/src/share/org/apache/catalina/valves
ExtendedAccessLogValve.java
Log:
Port from 5: If bytes are requested, then print bytes not the date.
Revision ChangesPath
1.2 +11 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java
Index: ExtendedAccessLogValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExtendedAccessLogValve.java 8 Jul 2003 23:12:51 - 1.1
+++ ExtendedAccessLogValve.java 18 Jul 2003 01:24:45 - 1.2
@@ -637,9 +637,13 @@
result.append(timeTakenFormatter.format(runTime/1000d));
else if (FieldInfo.SPECIAL_TIME==fieldInfos[i].location)
result.append(timeFormatter.format(date));
-else if (FieldInfo.SPECIAL_BYTES==fieldInfos[i].location)
-result.append(dateFormatter.format(date));
-else if (FieldInfo.SPECIAL_CACHED==fieldInfos[i].location)
+else if (FieldInfo.SPECIAL_BYTES==fieldInfos[i].location) {
+int length = response.getContentCount();
+if (length 0)
+result.append(length);
+else
+result.append(-);
+} else if (FieldInfo.SPECIAL_CACHED==fieldInfos[i].location)
result.append('-'); /* I don't know how to evaluate this! */
else
result.append(?WTF?); /* This should never happen! */
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves ExtendedAccessLogValve.java AccessLogValve.java
funkman 2003/07/08 16:12:51 Modified:catalina/src/share/org/apache/catalina/mbeans mbeans-descriptors.xml catalina/src/share/org/apache/catalina/valves AccessLogValve.java Added: catalina/src/share/org/apache/catalina/valves ExtendedAccessLogValve.java Log: Backport changes from tomcat 5 This is literally a copy from the 5 version - New (from 5) ExtendAccessLogValve - Fix bz - 20380 AccessLogValve incorrectly calculates timezone - Enc bz - 16374 Date in file name configurable - Enc bz - 16400 Allow logging to be conditional Also get Costin's %D Revision ChangesPath 1.76 +116 -46 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml Index: mbeans-descriptors.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- mbeans-descriptors.xml19 Feb 2003 01:04:44 - 1.75 +++ mbeans-descriptors.xml8 Jul 2003 23:12:51 - 1.76 @@ -10,53 +10,60 @@ -- mbeans-descriptors - - - mbean name=AccessLogValve -className=org.apache.catalina.mbeans.ClassNameMBean - description=Valve that generates a web server access log - domain=Catalina -group=Valve - type=org.apache.catalina.valves.AccessLogValve - -attribute name=className - description=Fully qualified class name of the managed object - type=java.lang.String -writeable=false/ - -attribute name=debug - description=The debugging detail level for this component - type=int/ - -attribute name=directory - description=The directory in which log files are created - type=java.lang.String/ + mbean name=AccessLogValve + description=Valve that generates a web server access log + domain=Catalina + group=Valve + type=org.apache.catalina.valves.AccessLogValve + +attribute name=className + description=Fully qualified class name of the managed object + type=java.lang.String + writeable=false/ + +attribute name=debug + description=The debugging detail level for this component + type=int/ + +attribute name=containerName + description=Object name of the container + type=javax.management.ObjectName/ + +attribute name=directory + description=The directory in which log files are created + type=java.lang.String/ attribute name=pattern - description=The pattern used to format our access log lines - type=java.lang.String/ - -attribute name=prefix - description=The prefix that is added to log file filenames - type=java.lang.String/ - -attribute name=resolveHosts - description=Resolve hosts - is=true - type=boolean/ - -attribute name=rotatable - description=Rotate log - is=true - type=boolean/ - -attribute name=suffix - description=The suffix that is added to log file filenames - type=java.lang.String/ + description=The pattern used to format our access log lines + type=java.lang.String/ +attribute name=prefix + description=The prefix that is added to log file filenames + type=java.lang.String/ + +attribute name=resolveHosts + description=Resolve hosts + is=true + type=boolean/ + +attribute name=rotatable + description=Flag to indicate automatic log rotation. + is=true + type=boolean/ + +attribute name=suffix + description=The suffix that is added to log file filenames + type=java.lang.String/ + +attribute name=condition + description=The value to look for conditional logging. + type=java.lang.String/ + +attribute name=fileDateFormat + description=The format for the date date based log rotation. + type=java.lang.String/ /mbean - mbean name=BasicAuthenticator className=org.apache.catalina.mbeans.ClassNameMBean description=An Authenticator and Valve implementation of HTTP BASIC @@ -320,7 +327,7 @@
