diff --git a/lib/openjdk-1.8-jconsole.jar b/lib/openjdk-1.8-jconsole.jar new file mode 100644 index 0000000000..5c221cd536 Binary files /dev/null and b/lib/openjdk-1.8-jconsole.jar differ diff --git a/lib/openjdk-1.8-tools.jar b/lib/openjdk-1.8-tools.jar new file mode 100644 index 0000000000..04bb8af666 Binary files /dev/null and b/lib/openjdk-1.8-tools.jar differ diff --git a/pom.xml b/pom.xml index 0452ef1813..7590e48756 100644 --- a/pom.xml +++ b/pom.xml @@ -5,6 +5,7 @@ druid 1.1.20 + jar druid An JDBC datasource implementation. @@ -20,13 +21,13 @@ true UTF-8 - 1.6 + 1.8 local-file - file://${basedir}/lib/ + file://${project.basedir}/lib/ default @@ -678,5 +679,21 @@ test - + + com.sun + tools + 1.8 + system + ${project.basedir}/lib/openjdk-1.8-tools.jar + + + + com.sun + jconsole + 1.8 + system + ${project.basedir}/lib/openjdk-1.8-jconsole.jar + + + diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 3831a402a5..7b621a2494 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -3536,6 +3536,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat dataMap.put("PhysicalCloseCount", this.getDestroyCount()); dataMap.put("PhysicalConnectErrorCount", this.getCreateErrorCount()); + dataMap.put("DiscardCount", this.getDiscardCount()); + dataMap.put("ExecuteCount", this.getExecuteCount()); dataMap.put("ExecuteUpdateCount", this.getExecuteUpdateCount()); dataMap.put("ExecuteQueryCount", this.getExecuteQueryCount()); diff --git a/src/main/resources/support/http/resources/datasource.html b/src/main/resources/support/http/resources/datasource.html index 4794ac5631..5ba6003460 100644 --- a/src/main/resources/support/http/resources/datasource.html +++ b/src/main/resources/support/http/resources/datasource.html @@ -263,6 +263,11 @@ {{=datasourceNow.LogicConnectErrorCount}} Total connect error times + + DiscardCount + {{=datasourceNow.DiscardCount}} + Discard connection count with validate fail + RecycleErrorCount {{=datasourceNow.RecycleErrorCount}} diff --git a/src/main/resources/support/http/resources/js/lang.js b/src/main/resources/support/http/resources/js/lang.js index 378a536fdd..71c13dfbef 100644 --- a/src/main/resources/support/http/resources/js/lang.js +++ b/src/main/resources/support/http/resources/js/lang.js @@ -63,6 +63,7 @@ druid.lang = function() { 'PhysicalConnectCount' : ['PhysicalConnectCount', '物理连接打开次数'], 'PhysicalCloseCount' : ['PhysicalCloseCount', '物理关闭数量'], 'PhysicalConnectErrorCount' : ['PhysicalConnectErrorCount', '物理连接错误次数'], + 'DiscardCount' : ['DiscardCount', '校验失败废弃连接数'], 'ExecuteCount' : ['ExecuteCount (Total)', '执行数(总共)'], 'ErrorCount' : ['ErrorCount', '错误数'], 'CommitCount' : ['CommitCount', '提交数'], @@ -114,6 +115,7 @@ druid.lang = function() { 'RecycleErrorCount' : ['Logic Connection Recycle Count', '逻辑连接回收重用次数'], 'PhysicalConnectCountDesc' : ['Create physical connnection count', '产生的物理连接建立总数'], 'PhysicalCloseCountDesc' : ['Close physical connnection count', '产生的物理关闭总数'], + 'DiscardCountDesc' : ['Discard connection count with validate fail', '校验连接失败丢弃连接次数'], 'PhysicalConnectErrorCountDesc' : ['Total physical connect error times', '产生的物理连接失败总数'], 'ExecuteCountDesc' : ['', ''], 'ErrorCountDesc' : ['', ''],