diff --git a/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java b/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java index fb751e9307..802db7e7e7 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java +++ b/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java @@ -170,6 +170,7 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe map.put("NotEmptyWaitCount", dataSource.getNotEmptyWaitCount()); map.put("NotEmptyWaitNanos", dataSource.getNotEmptyWaitNanos()); + map.put("ErrorCount", dataSource.getErrorCount()); return new CompositeDataSupport(rowType, map); } @@ -189,7 +190,7 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe SimpleType.INTEGER, SimpleType.INTEGER, SimpleType.INTEGER, SimpleType.BOOLEAN, SimpleType.BOOLEAN, // SimpleType.BOOLEAN, SimpleType.LONG, SimpleType.LONG, SimpleType.LONG, SimpleType.STRING, // SimpleType.STRING, SimpleType.INTEGER, SimpleType.STRING, SimpleType.STRING, SimpleType.LONG, // - SimpleType.LONG, SimpleType.LONG, + SimpleType.LONG, SimpleType.LONG, SimpleType.LONG, // }; @@ -200,7 +201,7 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe "InitialSize", "MaxActive", "MinIdle", "PoolPreparedStatements", "TestOnBorrow", // "TestOnReturn", "MinEvictableIdleTimeMillis", "ConnectErrorCount", "CreateTimespanMillis", "DbType", // "ValidationQuery", "ValidationQueryTimeout", "DriverClassName", "Username", "RemoveAbandonedCount", // - "NotEmptyWaitCount", "NotEmptyWaitNanos" + "NotEmptyWaitCount", "NotEmptyWaitNanos", "ErrorCount" // }; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java index f60de20466..d472e852e2 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java @@ -67,6 +67,8 @@ public class DruidDataSourceFilterTest extends TestCase { Assert.assertEquals(0, JdbcStatManager.getInstance().getConnectionstat().getCloseCount()); // logic // close不会导致计数器+1 } + + Assert.assertEquals(1, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); dataSource.close();