Author: markt
Date: Fri Nov 27 21:09:22 2009
New Revision: 885016
URL: http://svn.apache.org/viewvc?rev=885016&view=rev
Log:
Make FileHandler.java extensible
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=885016&r1=885015&r2=885016&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 27 21:09:22 2009
@@ -147,11 +147,6 @@
+1: fhanik
-1:
-* Make FileHandler.java extensible
-
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/FileHandler.java?r1=666232&r2=709018&pathrev=793882&view=patch
- +1: fhanik, jim, markt, kkolinko
- -1:
-
* Allow configurable buffer size of loggers
http://svn.apache.org/viewvc?rev=814708&view=rev
http://svn.apache.org/viewvc?rev=814876&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java?rev=885016&r1=885015&r2=885016&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java Fri Nov 27
21:09:22 2009
@@ -60,7 +60,7 @@
this.prefix = prefix;
this.suffix = suffix;
configure();
- open();
+ openWriter();
}
@@ -121,9 +121,9 @@
if (!date.equals(tsDate)) {
synchronized (this) {
if (!date.equals(tsDate)) {
- close();
+ closeWriter();
date = tsDate;
- open();
+ openWriter();
}
}
}
@@ -158,6 +158,10 @@
* Close the currently open log file (if any).
*/
public void close() {
+ closeWriter();
+ }
+
+ protected void closeWriter() {
try {
if (writer == null)
@@ -197,7 +201,7 @@
String tsString = ts.toString().substring(0, 19);
date = tsString.substring(0, 10);
- String className = FileHandler.class.getName();
+ String className = this.getClass().getName(); //allow classes to
override
ClassLoader cl = Thread.currentThread().getContextClassLoader();
@@ -264,7 +268,11 @@
/**
* Open the new log file for the date specified by <code>date</code>.
*/
- private void open() {
+ protected void open() {
+ openWriter();
+ }
+
+ protected void openWriter() {
// Create the directory if necessary
File dir = new File(directory);
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=885016&r1=885015&r2=885016&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Nov 27 21:09:22 2009
@@ -285,6 +285,9 @@
Prevent NPE in JULI during shutdown when resources try to log messages
after JULI has been shutdown. (fhanik/kkolinko)
</fix>
+ <add>
+ Make the JULI FileHandler easier to extend. (fhanik)
+ </add>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
