Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

增强监控

Browse Source 
git-svn-id: http://code.alibabatech.com/svn/druid/trunk@345 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-07-01 06:35:34 +00:00
parent cc247dc425
commit b4d410a05d
4 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+9 -7
View File
@@ -26,6 +26,7 @@ import java.util.HashMap;
import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -305,7 +306,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (conn == null || conn.isClosed()) {
lock.lock();
try {
holder.reset();
decrementActiveCount();
closeCount++;
} finally {
@@ -332,7 +332,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (count >= maxIdle) {
lock.lock();
try {
holder.reset();
conn.close();
decrementActiveCount();
} finally {
@@ -355,7 +354,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
closeCount++;
// 第六步，加入队列中(putLast)
holder.reset();
putLast(holder);
recycleCount++;
} finally {
@@ -755,8 +753,12 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (this.connectionProperties == null) {
return null;
}
return connectionProperties.toString();
Properties properties = new Properties(this.connectionProperties);
if (properties.contains("password")) {
properties.put("password", "******");
}
return properties.toString();
}
public String[] getFilterClasses() {
@@ -841,7 +843,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
map.put("StatementLastErrorStackTrace", null);
}
map.put("StatementExecuteMillis", stat.getStatementStat().getMillisTotal());
map.put("StatementExecuteMillisTotal", stat.getStatementStat().getMillisTotal());
map.put("StatementExecuteLastTime", stat.getStatementStat().getExecuteLastTime());
map.put("ConnectionConnectingCount", stat.getConnectionStat().getConnectingCount());
map.put("ResultSetCloseCount", stat.getResultSetStat().getCloseCount());
@@ -952,7 +954,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
map.put("StatementLastErrorMessage", null);
map.put("StatementLastErrorStackTrace", null);
map.put("StatementExecuteMillis", null);
map.put("StatementExecuteMillisTotal", null);
map.put("ConnectionConnectingCount", null);
map.put("StatementExecuteLastTime", null);
map.put("ResultSetCloseCount", null);
src/main/java/com/alibaba/druid/pool/PoolableConnection.java
+1
View File
@@ -123,6 +123,7 @@ public class PoolableConnection implements PooledConnection, Connection {
listener.connectionClosed(new ConnectionEvent(this));
}
holder.reset();
holder.getDataSource().recycle(this);
holder = null;
conn = null;
src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyImpl.java
+7 -3
View File
@@ -169,10 +169,14 @@ public class DataSourceProxyImpl implements DataSourceProxy, DataSourceProxyImpl
}
public String getProperties() {
if (properties == null) {
if (this.properties == null) {
return null;
}
Properties properties = new Properties(this.properties);
if (properties.contains("password")) {
properties.put("password", "******");
}
return properties.toString();
}
@@ -247,7 +251,7 @@ public class DataSourceProxyImpl implements DataSourceProxy, DataSourceProxyImpl
map.put("StatementLastErrorStackTrace", null);
}
map.put("StatementExecuteMillis", stat.getStatementStat().getMillisTotal());
map.put("StatementExecuteMillisTotal", stat.getStatementStat().getMillisTotal());
map.put("StatementExecuteLastTime", stat.getStatementStat().getExecuteLastTime());
map.put("ConnectionConnectingCount", stat.getConnectionStat().getConnectingCount());
map.put("ResultSetCloseCount", stat.getResultSetStat().getCloseCount());
@@ -358,7 +362,7 @@ public class DataSourceProxyImpl implements DataSourceProxy, DataSourceProxyImpl
map.put("StatementLastErrorMessage", null);
map.put("StatementLastErrorStackTrace", null);
map.put("StatementExecuteMillis", null);
map.put("StatementExecuteMillisTotal", null);
map.put("ConnectionConnectingCount", null);
map.put("StatementExecuteLastTime", null);
map.put("ResultSetCloseCount", null);
src/main/java/com/alibaba/druid/stat/JdbcStatManager.java
+1 -1
View File
@@ -136,7 +136,7 @@ public class JdbcStatManager implements JdbcStatManagerMBean {
, "ConnectionConnectLastTime", "ConnectionConnectErrorCount", "ConnectionConnectErrorLastTime", "ConnectionConnectErrorLastMessage", "ConnectionConnectErrorLastStackTrace" //
, "StatementCreateCount", "StatementPrepareCount", "StatementPreCallCount", "StatementExecuteCount", "StatementRunningCount" //
, "StatementConcurrentMax", "StatementCloseCount", "StatementErrorCount", "StatementLastErrorTime", "StatementLastErrorMessage" //
, "StatementLastErrorStackTrace", "StatementExecuteMillis", "ConnectionConnectingCount", "StatementExecuteLastTime", "ResultSetCloseCount" //
, "StatementLastErrorStackTrace", "StatementExecuteMillisTotal", "ConnectionConnectingCount", "StatementExecuteLastTime", "ResultSetCloseCount" //
, "ResultSetOpenCount", "ResultSetOpenningCount", "ResultSetOpenningMax", "ResultSetFetchRowCount", "ResultSetLastOpenTime" //
, "ResultSetErrorCount", "ResultSetOpenningMillisTotal", "ResultSetLastErrorTime", "ResultSetLastErrorMessage", "ResultSetLastErrorStackTrace", "ConnectionConnectCount", "ConnectionErrorLastMessage", "ConnectionErrorLastStackTrace", "ConnectionConnectMillisTotal", "ConnectionConnectingCountMax" //
, "ConnectionConnectMillisMax", "ConnectionErrorLastTime", "ConnectionAliveMillisMax", "ConnectionAliveMillisMin" //