From 0ea17548cdb6bb61e2ffbbf37439bea964444731 Mon Sep 17 00:00:00 2001 From: Nonlone Date: Mon, 5 Aug 2019 16:53:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=E5=BA=9F=E5=BC=83=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 2 ++ src/main/resources/support/http/resources/datasource.html | 5 +++++ src/main/resources/support/http/resources/js/lang.js | 2 ++ 3 files changed, 9 insertions(+) diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 8e29afeb82..b880db3b1d 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -3503,6 +3503,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 76c9eaef21..690ce2c6b5 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' : ['', ''],