Re: [GUMP@vmgump-vm3]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed

2018-03-19 Thread Rainer Jung

Am 19.03.2018 um 04:52 schrieb Bill Barker:

To whom it may engage...
[concat] Testsuites with failed tests:
[concat] TEST-org.apache.tomcat.util.net.openssl.TestOpenSSLConf.APR.txt


Problem is in the test:

Testcase: testOpenSSLConfCmdCipher took 0.772 sec
FAILED
Wrong HostConfig ciphers
Expected: is ["AES256-SHA256"]
 but: was ["TLS_AES_256_GCM_SHA384", 
"TLS_CHACHA20_POLY1305_SHA256", "TLS_AES_128_GCM_SHA256", "AES256-SHA256"]

junit.framework.AssertionFailedError: Wrong HostConfig ciphers
Expected: is ["AES256-SHA256"]
 but: was ["TLS_AES_256_GCM_SHA384", 
"TLS_CHACHA20_POLY1305_SHA256", "TLS_AES_128_GCM_SHA256", "AES256-SHA256"]

at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:20)
	at 
org.apache.tomcat.util.net.openssl.TestOpenSSLConf.testOpenSSLConfCmdCipher(TestOpenSSLConf.java:78)



So new OpenSSL now provides more ciphers that match resp. has some 
automatic enables.


I hope I can look into it later today.

Regards,

Rainer


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62185] Acceptor Thread Terminates

2018-03-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62185

BogdanD  changed:

   What|Removed |Added

 Resolution|INVALID |---
 Status|RESOLVED|REOPENED

--- Comment #4 from BogdanD  ---
(In reply to Mark Thomas from comment #1)
> That is an (OS) configuration error, not a Tomcat bug.
> 
> Generally, OOME are not expected to be recoverable. If Tomcat experiences
> one it needs to be shutdown (if it isn't already) and restarted.

Hi guys, thanks for the replies. I understand the root cause is the
"misconfiguration" but do you consider it as normal behavior to have the Apache
process(after the exception) up and running but not accepting any request since
it's Acceptor thread is gone forever?

We consider this an improper handling of the case when Tomcat cannot create new
worker threads(The OOME thrown by the JVM is also a bit misleading in this
case, because is not a memory issue).

We encountered this in a production environment, during a spike and also
because there were other processes running and forking in the same UID as
Tomcat. The Tomcat process was still up but it couldn't accept new connections.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62185] Acceptor Thread Terminates

2018-03-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62185

Remy Maucherat  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 Status|REOPENED|RESOLVED

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62185] Acceptor Thread Terminates

2018-03-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62185

--- Comment #5 from Christopher Schultz  ---
   What|Removed |Added

 Resolution|--- |INVALID
 Status|REOPENED|RESOLVED

That's Rémy's way of encouraging you to join the user or dev lists. Bugzilla
isn't a great place to have a conversation. Please post there and reference
this BZ issue.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



tcnative experts: please have a look at BZ 53940

2018-03-19 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

All,

I'm guessing this is mostly directed towards Rainer: can someone look
at https://bz.apache.org/bugzilla/show_bug.cgi?id=53940? It's got a
proposed patch and IMO makes sense to implement.

I'm not familiar enough with OpenSSL and the way that the SSL engine
works to know if this is a valid technique.

Most people don't use CRLs so it won't affect their performance or
anything like that. But those who do rely on a CRL can't afford to
bounce their Tomcat instance or connector just to pick-up an updated CRL
.

- -chris
-BEGIN PGP SIGNATURE-
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQJRBAEBCAA7FiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlqvwIQdHGNocmlzQGNo
cmlzdG9waGVyc2NodWx0ei5uZXQACgkQHPApP6U8pFiCuxAAxuBMKICpWJjbm274
B7sLkUQVX28xCKaoOPhjWOJGuYqNHV4lwq7BXcyzG5hxm2ehb+hx4jJaP+t2a01g
XrxNfLcD39g4rqThpi2U1YYY2+3k6VoBvfbATWHvIOmgFBtEqDGTapRwhYZie8Fq
+/xuB39h0XB10v1lmXtoREV6sSVzY3FvOqz4LcVh2TFQN6uBmI4TRKjyUgm0BeQQ
iq0OA7Hgsvp6Xgf6P11wVD6vq9opRnAbt6KiDg3WOKJPgthylwToIab/AJkkO/77
6cK2LF/otpKNxSfVRoqnzjV3X2DX1hNy2mK1JSp3lwFALUplsmC3R7s/THSPFda1
ttLUy7IiUd0+EWwmHwQzW1oRE4lOSB2z99Yuv4HSrhxW43+AjCVqIdUebDF4OI2G
Bf8zAYwNm8Eh6mgBaQ5l0EPRkN1CEVkbWwVg2M8BjbidBEVdKH4LcKT4riSGTNO8
tqWO8Zr1hQ50dpZ8Ulcilj7s14vznqJEVs/adOb/Br6vxf2RyVyHyMYaXVV3ifuy
+cp+Ef8Y/KGqyPjsJsgAsszL2W3d0qyw7+O57duGgVDLpHHX+qTLsqo5hmL5xD7D
mRQSOxcB66wYbO+HR5+T4NrLnymsZX3SngHbhkadAEsBtN8UHZGwi1c7n9mhRmAR
/LPTqnWd/z7wBkpr1583goBTmpw=
=bSIb
-END PGP SIGNATURE-

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 53940] Added support for new CRL loading after expiration

2018-03-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=53940

Christopher Schultz  changed:

   What|Removed |Added

   Keywords||PatchAvailable

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: tcnative experts: please have a look at BZ 53940

2018-03-19 Thread Mark Thomas
On 19/03/18 13:52, Christopher Schultz wrote:
> All,
> 
> I'm guessing this is mostly directed towards Rainer: can someone look
> at https://bz.apache.org/bugzilla/show_bug.cgi?id=53940? It's got a
> proposed patch and IMO makes sense to implement.
> 
> I'm not familiar enough with OpenSSL and the way that the SSL engine
> works to know if this is a valid technique.
> 
> Most people don't use CRLs so it won't affect their performance or
> anything like that. But those who do rely on a CRL can't afford to
> bounce their Tomcat instance or connector just to pick-up an updated CRL
> .

Can't we just close that as WONTFIX on the grounds that you just trigger
the reload of the TLS config in Tomcat?

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: tcnative experts: please have a look at BZ 53940

2018-03-19 Thread Rémy Maucherat
On Mon, Mar 19, 2018 at 2:54 PM, Mark Thomas  wrote:

> On 19/03/18 13:52, Christopher Schultz wrote:
> > All,
> >
> > I'm guessing this is mostly directed towards Rainer: can someone look
> > at https://bz.apache.org/bugzilla/show_bug.cgi?id=53940? It's got a
> > proposed patch and IMO makes sense to implement.
> >
> > I'm not familiar enough with OpenSSL and the way that the SSL engine
> > works to know if this is a valid technique.
> >
> > Most people don't use CRLs so it won't affect their performance or
> > anything like that. But those who do rely on a CRL can't afford to
> > bounce their Tomcat instance or connector just to pick-up an updated CRL
> > .
>
> Can't we just close that as WONTFIX on the grounds that you just trigger
> the reload of the TLS config in Tomcat?
>
> +1
That reload feature is good since it's so versatile and solves problems
without having to add hacks elsewhere.

Rémy


Re: tcnative experts: please have a look at BZ 53940

2018-03-19 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 3/19/18 9:54 AM, Mark Thomas wrote:
> On 19/03/18 13:52, Christopher Schultz wrote:
>> All,
>> 
>> I'm guessing this is mostly directed towards Rainer: can someone
>> look at https://bz.apache.org/bugzilla/show_bug.cgi?id=53940?
>> It's got a proposed patch and IMO makes sense to implement.
>> 
>> I'm not familiar enough with OpenSSL and the way that the SSL
>> engine works to know if this is a valid technique.
>> 
>> Most people don't use CRLs so it won't affect their performance
>> or anything like that. But those who do rely on a CRL can't
>> afford to bounce their Tomcat instance or connector just to
>> pick-up an updated CRL .
> 
> Can't we just close that as WONTFIX on the grounds that you just
> trigger the reload of the TLS config in Tomcat?

It seems reasonable, but I believe this patch looks at the CRL's
reload "schedule" (I didn't know CRLs had such as thing) and respects
it. So Tomcat could auto-reload appropriately without having to set up
e.g. cron to reload on a schedule.

Also, I didn't realize that the reload was working for native-based
connectors. Now that I think about it, I think you said at one point
that we are simply relying on a finalizer to clean-up after abandoned
native SSL engine resources rather than going through the trouble to
maintain our own reference-counting infrastructure. So I guess that's
a moot point.

I'm okay closing this as WONTFIX with a note saying "issue a reload
command yourself". The original poster can come back to request this
feature specifically if manual-reloading is not acceptable.

- -chris
-BEGIN PGP SIGNATURE-
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQJRBAEBCAA7FiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlqvxXwdHGNocmlzQGNo
cmlzdG9waGVyc2NodWx0ei5uZXQACgkQHPApP6U8pFh8TQ/5AYDx/6FcpjBW5SOm
epfRIFQ+4QgLynAQMeBja2mYmtBd8mGYFRtw8NS9DHq+LcH4xIYhBl/CRiRdxpqz
MLUuUoTgvyDy8Sws/PY4HQEDX2/Yv64TYovSSpTuJJdkIDqDS4Wq5zL9hd9+DmDn
7IkbMoCv6rwI9SdP+dHhSm32lVYEzxN61WXQ/f9yadrEehwBDt6B0bGqbaDHfVr2
OMoUIu10p8Qxxmf98nFwBhGFhLxGXvdBZhLLUF2XqiHKzzjkubDxpTGXjg2mcUXu
H8LJYIWlW32kfA1oLWA6jeVPXtasuYEXXdvI+UIXxzIaUbrtEagmslX9H5ov7vha
gCug00Sdj+YqeUpP54vvF1/Mv0Dv2pNNH5/lDJkBADDsToUepUDn5G9YMuVv5vlN
5i5/XP5vHSr0/W2onj56KpEM6zfrJ87X4SKyCMVe7vztorq/kzryUXSilHY2DBj3
JgWQF1LilhB3xo5LuZTbPhDjGZGROCNgf0mEeTV9grirHV1Q3NcLj0W0AeOdQ5Ib
/3gUCG74KmABYL9+FNZRrFJzngdT48ogBfsAodZ1IJTbAW2T4PvRQp+fX8/T1QBJ
L30KDbXpwGlJdrkh3PkCxT1Zk5o7qo8I5KzVkXCgR3u16f+pP+EzjiHMsAgGydZb
fwzCu5iRBhD6r6mBBcf16d1E0k8=
=URhz
-END PGP SIGNATURE-

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1827203 - /tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java

2018-03-19 Thread markt
Author: markt
Date: Mon Mar 19 14:25:45 2018
New Revision: 1827203

URL: http://svn.apache.org/viewvc?rev=1827203&view=rev
Log:
Fix SpotBugs warning

Modified:
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java

Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1827203&r1=1827202&r2=1827203&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Mon Mar 19 
14:25:45 2018
@@ -154,7 +154,7 @@ public class AccessLogValve extends Abst
  * system default character set will be used. An empty string will be
  * treated as null when this property is assigned.
  */
-protected String encoding = null;
+protected volatile String encoding = null;
 
 // - Properties
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1827204 - /tomcat/trunk/webapps/docs/config/valve.xml

2018-03-19 Thread markt
Author: markt
Date: Mon Mar 19 14:30:26 2018
New Revision: 1827204

URL: http://svn.apache.org/viewvc?rev=1827204&view=rev
Log:
List AccessLogValve attributes in alphabetical order

Modified:
tomcat/trunk/webapps/docs/config/valve.xml

Modified: tomcat/trunk/webapps/docs/config/valve.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1827204&r1=1827203&r2=1827204&view=diff
==
--- tomcat/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/trunk/webapps/docs/config/valve.xml Mon Mar 19 14:30:26 2018
@@ -114,12 +114,47 @@
 
 
 
+  
+Flag to determine if logging will be buffered.
+   If set to false, then access logging will be written 
after each
+   request. Default value: true
+
+  
+
   
 Java class name of the implementation to use.  This MUST be set to
 org.apache.catalina.valves.AccessLogValve to use the
 default access log valve.
   
 
+  
+The same as conditionUnless. This attribute is
+   provided for backwards compatibility.
+
+  
+
+  
+Turns on conditional logging. If set, requests will be
+   logged only if ServletRequest.getAttribute() is
+   not null. For example, if this value is set to
+   important, then a particular request will only be 
logged
+   if ServletRequest.getAttribute("important") != null.
+   The use of Filters is an easy way to set/unset the attribute
+   in the ServletRequest on many different requests.
+
+  
+
+  
+Turns on conditional logging. If set, requests will be
+   logged only if ServletRequest.getAttribute() is
+   null. For example, if this value is set to
+   junk, then a particular request will only be logged
+   if ServletRequest.getAttribute("junk") == null.
+   The use of Filters is an easy way to set/unset the attribute
+   in the ServletRequest on many different requests.
+
+  
+
   
 Absolute or relative pathname of a directory in which log files
 created by this valve will be placed.  If a relative path is
@@ -128,15 +163,11 @@
 (relative to $CATALINA_BASE).
   
 
-  
-The prefix added to the start of each log file's name.  If not
-specified, the default value is "access_log".
-  
-
-  
-The suffix added to the end of each log file's name.  If not
-specified, the default value is "" (a zero-length string),
-meaning that no suffix will be added.
+  
+Character set used to write the log file. An empty string means
+to use the system default character set. Default value: use the
+system default character set.
+
   
 
   
@@ -150,26 +181,24 @@
 
   
 
-  
-Flag to determine if log rotation should occur.
-   If set to false, then this file is never rotated and
-   fileDateFormat is ignored.
-   Default value: true
+  
+The locale used to format timestamps in the access log
+   lines. Any timestamps configured using an
+   explicit SimpleDateFormat pattern (%{xxx}t)
+   are formatted in this locale. By default the
+   default locale of the Java process is used. Switching the
+   locale after the AccessLogValve is initialized is not supported.
+   Any timestamps using the common log format
+   (CLF) are always formatted in the locale
+   en_US.
 
   
 
-  
-By default for a rotatable log the active access log file name
-   will contain the current timestamp in fileDateFormat.
-   During rotation the file is closed and a new file with the next
-   timestamp in the name is created and used. When setting
-   renameOnRotate to true, the timestamp
-   is no longer part of the active log file name. Only during rotation
-   the file is closed and then renamed to include the timestamp.
-   This is similar to the behavior of most log frameworks when
-   doing time based rotation.
-   Default value: false
-
+  
+Log message buffers are usually recycled and re-used. To prevent
+   excessive memory usage, if a buffer grows beyond this size it will 
be
+   discarded. The default is 256 characters. This should 
be
+   set to larger than the typical access log message size.
   
 
   
@@ -180,23 +209,22 @@
 this attribute.
   
 
-  
-Character set used to write the log file. An empty string means
-to use the system default character set. Default value: use the
-system default character set.
-
+  
+The prefix added to the start of each log file's name.  If not
+  

Re: tcnative experts: please have a look at BZ 53940

2018-03-19 Thread Rainer Jung

Am 19.03.2018 um 15:13 schrieb Christopher Schultz:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 3/19/18 9:54 AM, Mark Thomas wrote:

On 19/03/18 13:52, Christopher Schultz wrote:

All,

I'm guessing this is mostly directed towards Rainer: can someone
look at https://bz.apache.org/bugzilla/show_bug.cgi?id=53940?
It's got a proposed patch and IMO makes sense to implement.

I'm not familiar enough with OpenSSL and the way that the SSL
engine works to know if this is a valid technique.

Most people don't use CRLs so it won't affect their performance
or anything like that. But those who do rely on a CRL can't
afford to bounce their Tomcat instance or connector just to
pick-up an updated CRL .


Can't we just close that as WONTFIX on the grounds that you just
trigger the reload of the TLS config in Tomcat?


It seems reasonable, but I believe this patch looks at the CRL's
reload "schedule" (I didn't know CRLs had such as thing) and respects
it. So Tomcat could auto-reload appropriately without having to set up
e.g. cron to reload on a schedule.

Also, I didn't realize that the reload was working for native-based
connectors. Now that I think about it, I think you said at one point
that we are simply relying on a finalizer to clean-up after abandoned
native SSL engine resources rather than going through the trouble to
maintain our own reference-counting infrastructure. So I guess that's
a moot point.

I'm okay closing this as WONTFIX with a note saying "issue a reload
command yourself". The original poster can come back to request this
feature specifically if manual-reloading is not acceptable.


Having only looked very shortly, there could be an issue with c->crl 
being freed and reinitialized. If that is shared between threads, we 
might get crashes under load or other misbehavior and instead would need 
a more atomic way of updating.


I hope I find some time and can look at httpd, whether it supports such 
a feature and how it is done there.


Regards,

Rainer


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1827223 - in /tomcat/trunk: java/org/apache/catalina/valves/AccessLogValve.java java/org/apache/catalina/valves/LocalStrings.properties webapps/docs/changelog.xml webapps/docs/config/valv

2018-03-19 Thread markt
Author: markt
Date: Mon Mar 19 18:35:03 2018
New Revision: 1827223

URL: http://svn.apache.org/viewvc?rev=1827223&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=52688
Add support for the maxDays attribute to specify the maximum number of days for 
which rotated access log files should be retained before deletion.

Modified:
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/valve.xml

Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1827223&r1=1827222&r2=1827223&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Mon Mar 19 
18:35:03 2018
@@ -87,7 +87,7 @@ public class AccessLogValve extends Abst
 /**
  * The prefix that is added to log file filenames.
  */
-protected String prefix = "access_log";
+protected volatile String prefix = "access_log";
 
 
 /**
@@ -111,7 +111,7 @@ public class AccessLogValve extends Abst
 /**
  * The suffix that is added to log file filenames.
  */
-protected String suffix = "";
+protected volatile String suffix = "";
 
 
 /**
@@ -156,9 +156,26 @@ public class AccessLogValve extends Abst
  */
 protected volatile String encoding = null;
 
+/**
+ * The number of days to retain the access log files before they are
+ * removed.
+ */
+private int maxDays = -1;
+private volatile boolean checkForOldLogs = false;
+
 // - Properties
 
 
+public int getMaxDays() {
+return maxDays;
+}
+
+
+public void setMaxDays(int maxDays) {
+this.maxDays = maxDays;
+}
+
+
 /**
  * @return the directory in which we create log files.
  */
@@ -358,6 +375,50 @@ public class AccessLogValve extends Abst
 buffered) {
 writer.flush();
 }
+
+int maxDays = this.maxDays;
+String prefix = this.prefix;
+String suffix = this.suffix;
+
+if (rotatable && checkForOldLogs && maxDays > 0) {
+long deleteIfLastModifiedBefore =
+System.currentTimeMillis() - (maxDays * 24L * 60 * 60 * 
1000);
+File dir = getDirectoryFile();
+if (dir.isDirectory()) {
+String[] oldAccessLogs = dir.list();
+
+if (oldAccessLogs != null) {
+for (String oldAccessLog : oldAccessLogs) {
+boolean match = false;
+
+if (prefix != null && prefix.length() > 0) {
+if (!oldAccessLog.startsWith(prefix)) {
+continue;
+}
+match = true;
+}
+
+if (suffix != null && suffix.length() > 0) {
+if (!oldAccessLog.endsWith(suffix)) {
+continue;
+}
+match = true;
+}
+
+if (match) {
+File file = new File(dir, oldAccessLog);
+if (file.isFile() && file.lastModified() < 
deleteIfLastModifiedBefore) {
+if (!file.delete()) {
+log.warn(sm.getString(
+"accessLogValve.deleteFail", 
file.getAbsolutePath()));
+}
+}
+}
+}
+}
+}
+checkForOldLogs = false;
+}
 }
 
 /**
@@ -423,6 +484,15 @@ public class AccessLogValve extends Abst
 //  Private Methods
 
 
+private File getDirectoryFile() {
+File dir = new File(directory);
+if (!dir.isAbsolute()) {
+dir = new File(getContainer().getCatalinaBase(), directory);
+}
+return dir;
+}
+
+
 /**
  * Create a File object based on the current log file name.
  * Directories are created as needed but the underlying file
@@ -432,12 +502,8 @@ public class AccessLogValve extends Abst
  * @return the log file object
  */
 private File getLogFile(boolean useDateStamp) {
-
 // Create the directory if necessary
-File dir = new File(directory);
-if (!dir.isAbsolute()) {
-dir = new File(getContainer().getCatalinaBase(), directory);
-}
+   

svn commit: r1827224 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/valves/AccessLogValve.java webapps/docs/config/valve.xml

2018-03-19 Thread markt
Author: markt
Date: Mon Mar 19 18:38:57 2018
New Revision: 1827224

URL: http://svn.apache.org/viewvc?rev=1827224&view=rev
Log:
Clean-up

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/tc8.5.x/trunk/webapps/docs/config/valve.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 19 18:38:57 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565

svn commit: r1827225 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/valves/AccessLogValve.java java/org/apache/catalina/valves/LocalStrings.properties webapps/docs/changelog.xml webapps/docs/

2018-03-19 Thread markt
Author: markt
Date: Mon Mar 19 18:39:42 2018
New Revision: 1827225

URL: http://svn.apache.org/viewvc?rev=1827225&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=52688
Add support for the maxDays attribute to specify the maximum number of days for 
which rotated access log files should be retained before deletion.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/valve.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 19 18:39:42 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,176236

svn commit: r1827227 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/AccessLogValve.java webapps/docs/config/valve.xml

2018-03-19 Thread markt
Author: markt
Date: Mon Mar 19 18:44:19 2018
New Revision: 1827227

URL: http://svn.apache.org/viewvc?rev=1827227&view=rev
Log:
Clean-up

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/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 19 18:44:19 2018
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305,1821303-1821311,1821313,1821316,1821330,1821365,1822235,1823165,1823341,1823490,1823493,1823498,1824299,1824313,1825715,1825874,1826367,1826379,18266

svn commit: r1827229 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/AccessLogValve.java java/org/apache/catalina/valves/LocalStrings.properties webapps/docs/changelog.xml webapps/docs/

2018-03-19 Thread markt
Author: markt
Date: Mon Mar 19 18:51:51 2018
New Revision: 1827229

URL: http://svn.apache.org/viewvc?rev=1827229&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=52688
Add support for the maxDays attribute to specify the maximum number of days for 
which rotated access log files should be retained before deletion.

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/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 19 18:51:51 2018
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810

[Bug 52688] Add ability to remove old access log files [PATCHES]

2018-03-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=52688

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #9 from Mark Thomas  ---
Since this was opened, the maxDays attribute was added to the JULI FileHandler.

I have therefore added a similar attribute to the AccessLogValve.

Fixed in:
- trunk for 9.0.7 onwards
- 8.5.x for 8.5.30 onwards
- 7.0.x for 7.0.86 onwards

Since this is a new feature and 8.0.x is close to end of life, I haven't
implemented it for 8.0.x.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-training] branch master updated: First draft of logging module

2018-03-19 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-training.git


The following commit(s) were added to refs/heads/master by this push:
 new b13e925  First draft of logging module
b13e925 is described below

commit b13e92505acb32dda4d8f7bd3016a1153fcebd76
Author: Mark Thomas 
AuthorDate: Mon Mar 19 20:10:40 2018 +

First draft of logging module
---
 modules/logging-01.html | 150 ++--
 1 file changed, 146 insertions(+), 4 deletions(-)

diff --git a/modules/logging-01.html b/modules/logging-01.html
index 2123443..5fba5b4 100644
--- a/modules/logging-01.html
+++ b/modules/logging-01.html
@@ -14,7 +14,149 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-Logging 01
-Slide 1
-Slide 2
-
+
+  Logging
+
+
+  Inspiration
+  
+“Explain to an experienced sysadmin who knows nothing about Tomcat 
or Java (but a lot
+about system utilities etc) how to set up a coherent and easy-to-manage 
logging system for
+Tomcat (and applications therein), including (safe) log rotation, 
archiving, cleanup
+etc.”
+André Warnier
+  
+
+
+  Types of logs
+  Access logs
+  Tomcat logs
+  Application logs
+
+
+  Logging Frameworks
+  There are lots
+  There are even frameworks for the frameworks
+  
+log4j, log4j2, logBack, SLF4J
+Commons Logging
+  
+
+
+  java.util.logging
+  JRE came a little late to the party
+  Similar to log4j
+  
+There are all fairly similar
+  
+
+
+  java.util.logging
+  Loggers are in a hierarchy
+  org
+  org.apache
+  org.apache.tomcat
+  Typically follows Java package hierarchy
+  Logger names typically match class names
+  Don't have to
+
+
+  java.util.logging
+  Set levels at any point in the hierarchy
+  Add handlers at any point in the hierarchy
+  Option to pass log message up hierarchy
+
+
+  java.util.logging
+  Is not class loader aware
+  Configuration file only allows one instance of a Handler type
+  
+Class unique ID is name + class loader. Multiple web apps could have same 
class with same
+logger. Need to be able to separate log messages.
+  
+
+
+  JULI
+  Java Util Logging Implementation
+  Commons logging hard-coded to use java.util.logging
+  Class loader aware
+  Allows multiple handlers of same type
+
+
+  Tomcat logging
+  A closer look at Tomcat's default logging.properties
+  
+Note the separate Container hierarchy under ContainerBase
+  
+
+
+  Production changes
+  Remove the ConsoleHandler
+  Nothing should output to STDOUT or STDERR during normal operations
+  catalina.-MM-DD.log should be mostly empty
+  Deployment and undeployment may trigger some logging 
+
+
+  Application logging
+  Servlet API provides very basic logging
+  log(String)
+  log(String, Throwable)
+  Not sufficiently flexible for most use cases
+
+
+  Application logging
+  Could use anything
+  Direct to stdout
+  Servlet API
+  Logging framework routed to files
+  Logging framework routed to stdout
+  java.util.logging
+
+
+  Frameworks
+  Configure to files outside of docBase
+  Configure to redirect to java.util.logging then configure 
via JULI
+  
+Could configure to STDOUT then capture but seems overly complex
+  
+
+
+  Servlet API
+  Passed to Container's logger
+  log(String) at INFO
+  log(String, Throwable) at ERROR
+  Configure via JULI
+  
+Could configure to STDOUT then capture but seems overly complex
+  
+
+
+  stdout
+  Or stderr
+  Time for a training course
+  swallowOutput on Context
+  All output for one request gets redirected to a single INFO 
log messages
+
+
+  Access logs
+  Logs every request
+  Separate from logging framework
+  Optimised for performance
+  
+We considered using JULI. When we tested it, the performance impact was 
too great.
+  
+
+
+  Access logs
+  rotation: rotatable, fileDateFormat, 
renameOnRotate
+  archiving: no support
+  clean-up: maxDays
+  
+maxDays is a recent addition prompted by this class
+archive via cron? probably combine with clean-up
+  
+
+
+  Demonstration
+  JSP that outputs to stdout
+

-- 
To stop receiving notification emails like this one, please contact
ma...@apache.org.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[GUMP@vmgump-vm3]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed

2018-03-19 Thread Bill Barker
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-test-apr has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 26 mins 50 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR -Dexecute.test.nio2=false 
-Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20180320/lib 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-
 master/dest-20180320/bin/openssl -Dexecute.test.apr=true 
-Dtest.excludePerformance=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.6-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu
 
ild/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util-scan.jar:/srv/gump/public/workspac

svn commit: r1827264 - /tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java

2018-03-19 Thread kfujino
Author: kfujino
Date: Tue Mar 20 06:10:25 2018
New Revision: 1827264

URL: http://svn.apache.org/viewvc?rev=1827264&view=rev
Log:
Fix JavaDoc for FragmentationInterceptor.

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java?rev=1827264&r1=1827263&r2=1827264&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
 Tue Mar 20 06:10:25 2018
@@ -38,9 +38,9 @@ import org.apache.juli.logging.LogFactor
  * and smaller messages can make it through.
  *
  * Configuration Options
- * OrderInterceptor.expire= - how long do we keep the 
fragments in memory and wait for the rest to arrivedefault=60,000ms -> 
60seconds
+ * FragmentationInterceptor.expire= - how long do we keep 
the fragments in memory and wait for the rest to arrive default=60,000ms 
-> 60seconds
  * This setting is useful to avoid OutOfMemoryErrors
- * OrderInterceptor.maxSize= - message size in bytes 
default=1024*100 (around a tenth of a MB)
+ * FragmentationInterceptor.maxSize= - message size in 
bytes default=1024*100 (around a tenth of a MB)
  * @version 1.0
  */
 public class FragmentationInterceptor extends ChannelInterceptorBase {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1827265 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java

2018-03-19 Thread kfujino
Author: kfujino
Date: Tue Mar 20 06:11:24 2018
New Revision: 1827265

URL: http://svn.apache.org/viewvc?rev=1827265&view=rev
Log:
Fix JavaDoc for FragmentationInterceptor.

Modified:

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java?rev=1827265&r1=1827264&r2=1827265&view=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
 Tue Mar 20 06:11:24 2018
@@ -38,9 +38,9 @@ import org.apache.juli.logging.LogFactor
  * and smaller messages can make it through.
  *
  * Configuration Options
- * OrderInterceptor.expire= - how long do we keep the 
fragments in memory and wait for the rest to arrivedefault=60,000ms -> 
60seconds
+ * FragmentationInterceptor.expire= - how long do we keep 
the fragments in memory and wait for the rest to arrive default=60,000ms 
-> 60seconds
  * This setting is useful to avoid OutOfMemoryErrors
- * OrderInterceptor.maxSize= - message size in bytes 
default=1024*100 (around a tenth of a MB)
+ * FragmentationInterceptor.maxSize= - message size in 
bytes default=1024*100 (around a tenth of a MB)
  * @version 1.0
  */
 public class FragmentationInterceptor extends ChannelInterceptorBase {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1827266 - /tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java

2018-03-19 Thread kfujino
Author: kfujino
Date: Tue Mar 20 06:12:37 2018
New Revision: 1827266

URL: http://svn.apache.org/viewvc?rev=1827266&view=rev
Log:
Fix JavaDoc for FragmentationInterceptor.

Modified:

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java?rev=1827266&r1=1827265&r2=1827266&view=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
 Tue Mar 20 06:12:37 2018
@@ -38,9 +38,9 @@ import org.apache.juli.logging.LogFactor
  * and smaller messages can make it through.
  *
  * Configuration Options
- * OrderInterceptor.expire= - how long do we keep the 
fragments in memory and wait for the rest to arrivedefault=60,000ms -> 
60seconds
+ * FragmentationInterceptor.expire= - how long do we keep 
the fragments in memory and wait for the rest to arrive default=60,000ms 
-> 60seconds
  * This setting is useful to avoid OutOfMemoryErrors
- * OrderInterceptor.maxSize= - message size in bytes 
default=1024*100 (around a tenth of a MB)
+ * FragmentationInterceptor.maxSize= - message size in 
bytes default=1024*100 (around a tenth of a MB)
  * @version 1.0
  */
 public class FragmentationInterceptor extends ChannelInterceptorBase {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1827267 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java

2018-03-19 Thread kfujino
Author: kfujino
Date: Tue Mar 20 06:13:15 2018
New Revision: 1827267

URL: http://svn.apache.org/viewvc?rev=1827267&view=rev
Log:
Fix JavaDoc for FragmentationInterceptor.

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java?rev=1827267&r1=1827266&r2=1827267&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
 Tue Mar 20 06:13:15 2018
@@ -35,9 +35,9 @@ import org.apache.catalina.tribes.io.XBy
  * and smaller messages can make it through.
  * 
  * Configuration Options
- * OrderInterceptor.expire= - how long do we keep the fragments 
in memory and wait for the rest to arrivedefault=60,000ms -> 60seconds
+ * FragmentationInterceptor.expire= - how long do we keep the 
fragments in memory and wait for the rest to arrive default=60,000ms -> 
60seconds
  * This setting is useful to avoid OutOfMemoryErrors
- * OrderInterceptor.maxSize= - message size in bytes 
default=1024*100 (around a tenth of a MB)
+ * FragmentationInterceptor.maxSize= - message size in bytes 
default=1024*100 (around a tenth of a MB)
  * @author Filip Hanik
  * @version 1.0
  */



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1827268 - in /tomcat/trunk/webapps/docs: changelog.xml config/cluster-interceptor.xml

2018-03-19 Thread kfujino
Author: kfujino
Date: Tue Mar 20 06:18:49 2018
New Revision: 1827268

URL: http://svn.apache.org/viewvc?rev=1827268&view=rev
Log:
Add document for FragmentationInterceptor.

Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/cluster-interceptor.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1827268&r1=1827267&r2=1827268&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Mar 20 06:18:49 2018
@@ -105,6 +105,13 @@
   
 
   
+  
+
+  
+Add document for FragmentationInterceptor. (kfujino)
+  
+
+  
   
 
   

Modified: tomcat/trunk/webapps/docs/config/cluster-interceptor.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-interceptor.xml?rev=1827268&r1=1827267&r2=1827268&view=diff
==
--- tomcat/trunk/webapps/docs/config/cluster-interceptor.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-interceptor.xml Tue Mar 20 
06:18:49 2018
@@ -108,6 +108,18 @@
  

   
+  
+   
+ 
+   How long do we keep the fragments in memory and wait for the rest to 
arrive.
+   The default is 6 ms.
+ 
+ 
+   The maximum message size in bytes. If the message size exceeds this 
value, this interceptor fragments the message and sends them.
+   If it is less than this value, this interceptor does not fragment the 
message and sent in as one message. The default is 1024*100.
+ 
+   
+  
   

  



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1827269 - in /tomcat/tc8.5.x/trunk/webapps/docs: changelog.xml config/cluster-interceptor.xml

2018-03-19 Thread kfujino
Author: kfujino
Date: Tue Mar 20 06:19:47 2018
New Revision: 1827269

URL: http://svn.apache.org/viewvc?rev=1827269&view=rev
Log:
Add document for FragmentationInterceptor.

Modified:
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/cluster-interceptor.xml

Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1827269&r1=1827268&r2=1827269&view=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue Mar 20 06:19:47 2018
@@ -105,6 +105,13 @@
   
 
   
+  
+
+  
+Add document for FragmentationInterceptor. (kfujino)
+  
+
+  
   
 
   

Modified: tomcat/tc8.5.x/trunk/webapps/docs/config/cluster-interceptor.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/config/cluster-interceptor.xml?rev=1827269&r1=1827268&r2=1827269&view=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/config/cluster-interceptor.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/config/cluster-interceptor.xml Tue Mar 20 
06:19:47 2018
@@ -108,6 +108,18 @@
  

   
+  
+   
+ 
+   How long do we keep the fragments in memory and wait for the rest to 
arrive.
+   The default is 6 ms.
+ 
+ 
+   The maximum message size in bytes. If the message size exceeds this 
value, this interceptor fragments the message and sends them.
+   If it is less than this value, this interceptor does not fragment the 
message and sent in as one message. The default is 1024*100.
+ 
+   
+  
   

  



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1827270 - in /tomcat/tc8.0.x/trunk/webapps/docs: changelog.xml config/cluster-interceptor.xml

2018-03-19 Thread kfujino
Author: kfujino
Date: Tue Mar 20 06:20:46 2018
New Revision: 1827270

URL: http://svn.apache.org/viewvc?rev=1827270&view=rev
Log:
Add document for FragmentationInterceptor.

Modified:
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.0.x/trunk/webapps/docs/config/cluster-interceptor.xml

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1827270&r1=1827269&r2=1827270&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Mar 20 06:20:46 2018
@@ -106,6 +106,9 @@
 a plain text response. Based on a suggestion from Muthukumar Marikani.
 (markt)
   
+  
+Add document for FragmentationInterceptor. (kfujino)
+  
 
   
   

Modified: tomcat/tc8.0.x/trunk/webapps/docs/config/cluster-interceptor.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/config/cluster-interceptor.xml?rev=1827270&r1=1827269&r2=1827270&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/config/cluster-interceptor.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/config/cluster-interceptor.xml Tue Mar 20 
06:20:46 2018
@@ -109,6 +109,18 @@
  

   
+  
+   
+ 
+   How long do we keep the fragments in memory and wait for the rest to 
arrive.
+   The default is 6 ms.
+ 
+ 
+   The maximum message size in bytes. If the message size exceeds this 
value, this interceptor fragments the message and sends them.
+   If it is less than this value, this interceptor does not fragment the 
message and sent in as one message. The default is 1024*100.
+ 
+   
+  
   

  



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1827271 - in /tomcat/tc7.0.x/trunk/webapps/docs: changelog.xml config/cluster-interceptor.xml

2018-03-19 Thread kfujino
Author: kfujino
Date: Tue Mar 20 06:21:49 2018
New Revision: 1827271

URL: http://svn.apache.org/viewvc?rev=1827271&view=rev
Log:
Add document for FragmentationInterceptor.

Modified:
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-interceptor.xml

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1827271&r1=1827270&r2=1827271&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Mar 20 06:21:49 2018
@@ -125,6 +125,9 @@
 a plain text response. Based on a suggestion from Muthukumar Marikani.
 (markt)
   
+  
+Add document for FragmentationInterceptor. (kfujino)
+  
 
   
   

Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-interceptor.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-interceptor.xml?rev=1827271&r1=1827270&r2=1827271&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-interceptor.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-interceptor.xml Tue Mar 20 
06:21:49 2018
@@ -109,6 +109,18 @@
  

   
+  
+   
+ 
+   How long do we keep the fragments in memory and wait for the rest to 
arrive.
+   The default is 6 ms.
+ 
+ 
+   The maximum message size in bytes. If the message size exceeds this 
value, this interceptor fragments the message and sends them.
+   If it is less than this value, this interceptor does not fragment the 
message and sent in as one message. The default is 1024*100.
+ 
+   
+  
   

  



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1827272 - in /tomcat/trunk: java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptorMBe

2018-03-19 Thread kfujino
Author: kfujino
Date: Tue Mar 20 06:38:38 2018
New Revision: 1827272

URL: http://svn.apache.org/viewvc?rev=1827272&view=rev
Log:
Add JMX support for FragmentationInterceptor in order to prevent warning of 
startup.

Added:

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptorMBean.java
   (with props)
Modified:

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java?rev=1827272&r1=1827271&r2=1827272&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
 Tue Mar 20 06:38:38 2018
@@ -43,7 +43,7 @@ import org.apache.juli.logging.LogFactor
  * FragmentationInterceptor.maxSize= - message size in 
bytes default=1024*100 (around a tenth of a MB)
  * @version 1.0
  */
-public class FragmentationInterceptor extends ChannelInterceptorBase {
+public class FragmentationInterceptor extends ChannelInterceptorBase 
implements FragmentationInterceptorMBean {
 private static final Log log = 
LogFactory.getLog(FragmentationInterceptor.class);
 protected static final StringManager sm = 
StringManager.getManager(FragmentationInterceptor.class);
 
@@ -157,19 +157,22 @@ public class FragmentationInterceptor ex
 super.heartbeat();
 }
 
-
+@Override
 public int getMaxSize() {
 return maxSize;
 }
 
+@Override
 public long getExpire() {
 return expire;
 }
 
+@Override
 public void setMaxSize(int maxSize) {
 this.maxSize = maxSize;
 }
 
+@Override
 public void setExpire(long expire) {
 this.expire = expire;
 }

Added: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptorMBean.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptorMBean.java?rev=1827272&view=auto
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptorMBean.java
 (added)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptorMBean.java
 Tue Mar 20 06:38:38 2018
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.tribes.group.interceptors;
+
+public interface FragmentationInterceptorMBean {
+
+// Attributes
+public int getMaxSize();
+
+public long getExpire();
+
+public void setMaxSize(int maxSize);
+
+public void setExpire(long expire);
+}
\ No newline at end of file

Propchange: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptorMBean.java
--
svn:eol-style = native

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1827272&r1=1827271&r2=1827272&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Mar 20 06:38:38 2018
@@ -112,6 +112,14 @@
   
 
   
+  
+
+  
+Add JMX support for FragmentationInterceptor in order to
+prevent warning of startup. (kfujino)
+  
+
+  
   
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1827273 - in /tomcat/tc8.5.x/trunk: java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java java/org/apache/catalina/tribes/group/interceptors/FragmentationInterc

2018-03-19 Thread kfujino
Author: kfujino
Date: Tue Mar 20 06:39:40 2018
New Revision: 1827273

URL: http://svn.apache.org/viewvc?rev=1827273&view=rev
Log:
Add JMX support for FragmentationInterceptor in order to prevent warning of 
startup.

Added:

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptorMBean.java
   (with props)
Modified:

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java?rev=1827273&r1=1827272&r2=1827273&view=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
 Tue Mar 20 06:39:40 2018
@@ -43,7 +43,7 @@ import org.apache.juli.logging.LogFactor
  * FragmentationInterceptor.maxSize= - message size in 
bytes default=1024*100 (around a tenth of a MB)
  * @version 1.0
  */
-public class FragmentationInterceptor extends ChannelInterceptorBase {
+public class FragmentationInterceptor extends ChannelInterceptorBase 
implements FragmentationInterceptorMBean {
 private static final Log log = 
LogFactory.getLog(FragmentationInterceptor.class);
 protected static final StringManager sm = 
StringManager.getManager(FragmentationInterceptor.class);
 
@@ -157,19 +157,22 @@ public class FragmentationInterceptor ex
 super.heartbeat();
 }
 
-
+@Override
 public int getMaxSize() {
 return maxSize;
 }
 
+@Override
 public long getExpire() {
 return expire;
 }
 
+@Override
 public void setMaxSize(int maxSize) {
 this.maxSize = maxSize;
 }
 
+@Override
 public void setExpire(long expire) {
 this.expire = expire;
 }

Added: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptorMBean.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptorMBean.java?rev=1827273&view=auto
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptorMBean.java
 (added)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptorMBean.java
 Tue Mar 20 06:39:40 2018
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.tribes.group.interceptors;
+
+public interface FragmentationInterceptorMBean {
+
+// Attributes
+public int getMaxSize();
+
+public long getExpire();
+
+public void setMaxSize(int maxSize);
+
+public void setExpire(long expire);
+}
\ No newline at end of file

Propchange: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptorMBean.java
--
svn:eol-style = native

Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1827273&r1=1827272&r2=1827273&view=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue Mar 20 06:39:40 2018
@@ -112,6 +112,14 @@
   
 
   
+  
+
+  
+Add JMX support for FragmentationInterceptor in order to
+prevent warning of startup. (kfujino)
+  
+
+  
   
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org