diff --git a/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java b/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java index 1f51009408..52830a615f 100644 --- a/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java +++ b/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java @@ -387,6 +387,8 @@ public class StatViewServlet extends HttpServlet { dataMap.put("MaxActive", dataSource.getMaxActive()); dataMap.put("QueryTimeout", dataSource.getQueryTimeout()); + dataMap.put("TransactionQueryTimeout", dataSource.getTransactionQueryTimeout()); + dataMap.put("LoginTimeout", dataSource.getLoginTimeout()); dataMap.put("ValidConnectionCheckerClassName", dataSource.getValidConnectionCheckerClassName()); dataMap.put("ExceptionSorterClassName", dataSource.getExceptionSorterClassName()); @@ -405,6 +407,10 @@ public class StatViewServlet extends HttpServlet { dataMap.put("PhysicalConnectCount", dataSource.getCreateCount()); dataMap.put("PhysicalCloseCount", dataSource.getDestroyCount()); dataMap.put("PhysicalConnectErrorCount", dataSource.getCreateErrorCount()); + + dataMap.put("ExecuteCount", dataSource.getExecuteCount()); + dataMap.put("CommitCount", dataSource.getCommitCount()); + dataMap.put("RollbackCount", dataSource.getRollbackCount()); dataMap.put("PSCacheAccessCount", dataSource.getCachedPreparedStatementAccessCount()); dataMap.put("PSCacheHitCount", dataSource.getCachedPreparedStatementHitCount()); diff --git a/src/main/resources/support/http/resources/js/datasource.js b/src/main/resources/support/http/resources/js/datasource.js index c00ce2d492..217a3008b6 100644 --- a/src/main/resources/support/http/resources/js/datasource.js +++ b/src/main/resources/support/http/resources/js/datasource.js @@ -22,6 +22,8 @@ function fillDataSourceInfo(datasource) { changeInnerHtml("DS-Info-MaxActive" + datasource.Identity, datasource.MaxActive); changeInnerHtml("DS-Info-QueryTimeout" + datasource.Identity, datasource.QueryTimeout); + changeInnerHtml("DS-Info-TransactionQueryTimeout" + datasource.Identity, datasource.TransactionQueryTimeout); + changeInnerHtml("DS-Info-LoginTimeout" + datasource.Identity, datasource.LoginTimeout); changeInnerHtml("DS-Info-ValidConnectionCheckerClassName" + datasource.Identity, datasource.ValidConnectionCheckerClassName); changeInnerHtml("DS-Info-ExceptionSorterClassName" + datasource.Identity, datasource.ExceptionSorterClassName); @@ -51,6 +53,10 @@ function fillDataSourceInfo(datasource) { changeInnerHtml("DS-Info-PhysicalConnectCount" + datasource.Identity, datasource.PhysicalConnectCount); changeInnerHtml("DS-Info-PhysicalCloseCount" + datasource.Identity, datasource.PhysicalCloseCount); changeInnerHtml("DS-Info-PhysicalConnectErrorCount" + datasource.Identity, datasource.PhysicalConnectErrorCount); + + changeInnerHtml("DS-Info-ExecuteCount" + datasource.Identity, datasource.ExecuteCount); + changeInnerHtml("DS-Info-CommitCount" + datasource.Identity, datasource.CommitCount); + changeInnerHtml("DS-Info-RollbackCount" + datasource.Identity, datasource.RollbackCount); changeInnerHtml("DS-Info-PSCacheAccessCount" + datasource.Identity, datasource.PSCacheAccessCount); changeInnerHtml("DS-Info-PSCacheHitCount" + datasource.Identity, datasource.PSCacheHitCount); @@ -86,6 +92,8 @@ function generateDataSourceDiv(datasource) { listHtml += '* MaxActive The maximum number of connections for a pool'; listHtml += '* QueryTimeout  '; + listHtml += '* TransactionQueryTimeout  '; + listHtml += '* LoginTimeout  '; listHtml += '* ValidConnectionCheckerClassName  '; listHtml += '* ExceptionSorterClassName  '; @@ -115,6 +123,10 @@ function generateDataSourceDiv(datasource) { listHtml += 'PhysicalConnectCount Create physical connnection count'; listHtml += 'PhysicalCloseCount Close physical connnection count'; listHtml += 'PhysicalConnectErrorCount Total physical connect error times'; + + listHtml += 'ExecuteCount  '; + listHtml += 'CommitCount  '; + listHtml += 'RollbackCount  '; listHtml += 'PSCacheAccessCount PerpareStatement access count'; listHtml += 'PSCacheHitCount PerpareStatement hit count';