You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kf...@apache.org on 2015/06/29 11:32:26 UTC
svn commit: r1688168 - in /tomcat/tc8.0.x/trunk:
modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/
webapps/docs/
Author: kfujino
Date: Mon Jun 29 09:32:25 2015
New Revision: 1688168
URL: http://svn.apache.org/r1688168
Log:
- In SlowQueryReportJmx, the LogSlow and logFailed attributes that inherited from SlowQueryReport are used as a condition of whether JMX notifications are sent.
- Ensure that specified Boolean attribute values of SlowQueryReport reflect correctly. The LogSlow and the logFailed are not system property, these are attributes of SlowQueryReport.
Modified:
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java?rev=1688168&r1=1688167&r2=1688168&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java (original)
+++ tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java Mon Jun 29 09:32:25 2015
@@ -270,10 +270,10 @@ public class SlowQueryReport extends Abs
setMaxQueries(Integer.parseInt(p2.getValue()));
}
if (p3!=null) {
- setLogSlow(Boolean.getBoolean(p3.getValue()));
+ setLogSlow(Boolean.parseBoolean(p3.getValue()));
}
if (p4!=null) {
- setLogFailed(Boolean.getBoolean(p4.getValue()));
+ setLogFailed(Boolean.parseBoolean(p4.getValue()));
}
}
Modified: tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java?rev=1688168&r1=1688167&r2=1688168&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java (original)
+++ tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java Mon Jun 29 09:32:25 2015
@@ -150,7 +150,7 @@ public class SlowQueryReportJmx extends
@Override
protected String reportFailedQuery(String query, Object[] args, String name, long start, Throwable t) {
query = super.reportFailedQuery(query, args, name, start, t);
- notifyJmx(query,FAILED_QUERY_NOTIFICATION);
+ if (isLogFailed()) notifyJmx(query,FAILED_QUERY_NOTIFICATION);
return query;
}
@@ -184,7 +184,7 @@ public class SlowQueryReportJmx extends
@Override
protected String reportSlowQuery(String query, Object[] args, String name, long start, long delta) {
query = super.reportSlowQuery(query, args, name, start, delta);
- notifyJmx(query,SLOW_QUERY_NOTIFICATION);
+ if (isLogSlow()) notifyJmx(query,SLOW_QUERY_NOTIFICATION);
return query;
}
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=1688168&r1=1688167&r2=1688168&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Jun 29 09:32:25 2015
@@ -199,6 +199,18 @@
<code>SlowQueryReport#removeOldest</code> and handle the abandoned
connection properly. (kfujino)
</fix>
+ <fix>
+ <bug>58042</bug>: In <code>SlowQueryReportJmx</code>, the
+ <code>LogSlow</code> and <code>logFailed</code> attributes that
+ inherited from <code>SlowQueryReport</code> are used as a condition of
+ whether JMX notifications are sent. (kfujino)
+ </fix>
+ <fix>
+ Ensure that specified <code>Boolean</code> attribute values of
+ <code>SlowQueryReport</code> reflect correctly. The <code>LogSlow</code>
+ and the <code>logFailed</code> are not system property, these are
+ attributes of <code>SlowQueryReport</code>. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org