Author: markt
Date: Wed Feb 10 23:05:59 2010
New Revision: 908732
URL: http://svn.apache.org/viewvc?rev=908732&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48614
Stream encoder uses an internal buffer and the wrong default was being used in
the code (fhanik)
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
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
tomcat/tc6.0.x/trunk/webapps/docs/logging.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 10 23:05:59 2010
@@ -1,2 +1,2 @@
/tomcat:883362
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77
0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,8902
65,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,899284,899348,899420,905151
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77
0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,8902
65,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,899284,899348,899420,903916,905151,908721
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=908732&r1=908731&r2=908732&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Feb 10 23:05:59 2010
@@ -106,19 +106,6 @@
+1: kkolinko, jfclere, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48614
- Stream encoder uses an internal buffer and the wrong default was being used
in the code
- http://svn.apache.org/viewvc?rev=903916&view=rev
- +1: fhanik, markt
- +1: kkolinko: only if documentation on bufferSize property in logging.xml
- is updated as well
- ( Re documentation: maybe it would be easier to make a table of
- configurable properties for JULI and JDK JUL classes somewhere on the
- logging.xml page, or in the JavaDoc of the FileHandler class. - see issue
39661.
- I see that I haven't documented the "encoding" property of JULI
- FileHandler yet. )
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48613
Only attempt APR initialization if the <Listener> has been specified
http://svn.apache.org/viewvc?rev=904224&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=908732&r1=908731&r2=908732&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 Wed Feb 10
23:05:59 2010
@@ -100,7 +100,7 @@
/**
* Log buffer size
*/
- private int bufferSize = 0;
+ private int bufferSize = -1;
// --------------------------------------------------------- Public Methods
@@ -225,7 +225,7 @@
prefix = getProperty(className + ".prefix", "juli.");
if (suffix == null)
suffix = getProperty(className + ".suffix", ".log");
- String sBufferSize = getProperty(className + ".bufferSize", "8192");
+ String sBufferSize = getProperty(className + ".bufferSize",
String.valueOf(bufferSize));
try {
bufferSize = Integer.parseInt(sBufferSize);
} catch (NumberFormatException ignore) {
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=908732&r1=908731&r2=908732&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Feb 10 23:05:59 2010
@@ -34,6 +34,16 @@
</properties>
<body>
+<section name="Tomcat 6.0.25 (jfclere)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>48614</bug>: Correct JULI log file buffering so default behaviour
+ is no buffering. (fhanik)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
<section name="Tomcat 6.0.24 (jfclere)" rtext="released 2010-01-21">
<subsection name="Catalina">
<changelog>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/logging.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/logging.xml?rev=908732&r1=908731&r2=908732&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/logging.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/logging.xml Wed Feb 10 23:05:59 2010
@@ -128,11 +128,13 @@
boolean value.</li>
<li>The root logger can define its set of handlers using a
<code>.handlers</code> property.</li>
- <li>Logging is buffered using a default buffer size of 0 bytes.
- To change bufferSize, use the <code>bufferSize</code> property of a
handler.
- The value of <code>0</code> uses system default buffering.
- The value of <code><0</code> forces a writer flush upon each log
write.
- A value <code>>0</code> uses a BufferedOutputStream with the defined
value.</li>
+ <li>Logging is not buffered by default. To configure buffering, use the
+ <code>bufferSize</code> property of a handler. A value of <code>0</code>
+ uses system default buffering (typically an 8K buffer will be used). A
+ value of <code><0</code> forces a writer flush upon each log write. A
+ value <code>>0</code> uses a BufferedOutputStream with the defined
+ value but note that the system default buffering will also be
+ applied.</li>
<li>System property replacement is performed for property values which
contain ${systemPropertyName}.</li>
</ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
