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

improved monitor.

Browse Source
This commit is contained in:
wenshao
2017-02-03 22:09:01 +08:00
parent 20fa47a22f
commit d755cb072a
3 changed files with 65 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+27 -1
View File
@@ -118,7 +118,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
private long notEmptySignalCount = 0L;
private long notEmptyWaitNanos = 0L;
private int keepAliveCheckCount = 0;
private int keepAliveCheckCount = 0;
private int activePeak = 0;
private long activePeakTime = 0;
@@ -331,6 +331,24 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
this.setPoolPreparedStatements0(value);
}
}
{
Boolean value = getBoolean(properties, "druid.initVariants");
if (value != null) {
this.setInitVariants(value);
}
}
{
Boolean value = getBoolean(properties, "druid.initGlobalVariants");
if (value != null) {
this.setInitGlobalVariants(value);
}
}
{
Boolean value = getBoolean(properties, "druid.useUnfairLock");
if (value != null) {
this.setUseUnfairLock(value);
}
}
}
public boolean isUseGlobalDataSourceStat() {
@@ -2835,6 +2853,14 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
dataMap.put("MinEvictableIdleTimeMillis", this.getMinEvictableIdleTimeMillis());
dataMap.put("MaxEvictableIdleTimeMillis", this.getMaxEvictableIdleTimeMillis());
dataMap.put("LogDifferentThread", isLogDifferentThread());
dataMap.put("RecycleErrorCount", getRecycleErrorCount());
dataMap.put("PreparedStatementOpenCount", getPreparedStatementCount());
dataMap.put("PreparedStatementClosedCount", getClosedPreparedStatementCount());
dataMap.put("UseUnfairLock", isUseUnfairLock());
dataMap.put("InitGlobalVariants", isInitGlobalVariants());
dataMap.put("InitVariants", isInitVariants());
return dataMap;
}
src/main/resources/support/http/resources/datasource.html
+35
View File
@@ -173,6 +173,26 @@
<td>{{=datasourceNow.MaxWaitThreadCount}}</td>
<td class="lang" langKey="MaxWaitThreadCount"></td>
</tr>
<tr>
<td valign="top" class="td_lable" > * <span class="lang" langKey="LogDifferentThread">LogDifferentThread</span></td>
<td>{{=datasourceNow.LogDifferentThread}}</td>
<td class="lang" langKey="LogDifferentThread"></td>
</tr>
<tr>
<td valign="top" class="td_lable" > * <span class="lang" langKey="UseUnfairLock">UseUnfairLock</span></td>
<td>{{=datasourceNow.UseUnfairLock}}</td>
<td class="lang" langKey="UseUnfairLock"></td>
</tr>
<tr>
<td valign="top" class="td_lable" > * <span class="lang" langKey="InitGlobalVariants">InitGlobalVariants</span></td>
<td>{{=datasourceNow.InitGlobalVariants}}</td>
<td class="lang" langKey="InitGlobalVariants"></td>
</tr>
<tr>
<td valign="top" class="td_lable" > * <span class="lang" langKey="InitVariants">InitVariants</span></td>
<td>{{=datasourceNow.InitVariants}}</td>
<td class="lang" langKey="InitVariants"></td>
</tr>
<tr>
<td valign="top" class="td_lable" > <span class="lang" langKey="NotEmptyWaitCount">NotEmptyWaitCount</span></td>
<td>{{=datasourceNow.NotEmptyWaitCount}}</td>
@@ -243,6 +263,11 @@
<td>{{=datasourceNow.LogicConnectErrorCount}}</td>
<td class="lang" langKey="LogicConnectErrorCountDesc">Total connect error times</td>
</tr>
<tr>
<td valign="top" class="td_lable" > <span class="lang" langKey="RecycleErrorCount">RecycleErrorCount</span></td>
<td>{{=datasourceNow.RecycleErrorCount}}</td>
<td class="lang" langKey="RecycleErrorCount">Total connect error times</td>
</tr>
<tr>
<td valign="top" class="td_lable" > <span class="lang" langKey="PhysicalConnectCount">PhysicalConnectCount</span></td>
<td>{{=datasourceNow.PhysicalConnectCount}}</td>
@@ -278,6 +303,16 @@
<td>{{=datasourceNow.RollbackCount}}</td>
<td class="lang" langKey="RollbackCountDesc"></td>
</tr>
<tr>
<td valign="top" class="td_lable" > <span class="lang" langKey="PreparedStatementOpenCount">PSOpenCount</span></td>
<td>{{=datasourceNow.PreparedStatementOpenCount}}</td>
<td class="lang" langKey="PreparedStatementOpenCount"></td>
</tr>
<tr>
<td valign="top" class="td_lable" > <span class="lang" langKey="PreparedStatementClosedCount">PSClosedCount</span></td>
<td>{{=datasourceNow.PreparedStatementClosedCount}}</td>
<td class="lang" langKey="PreparedStatementClosedCount"></td>
</tr>
<tr>
<td valign="top" class="td_lable" > <span class="lang" langKey="PSCacheAccessCount">PSCacheAccessCount</span></td>
<td>{{=datasourceNow.PSCacheAccessCount}}</td>
src/main/resources/support/http/resources/js/lang.js
+3
View File
@@ -111,6 +111,7 @@ druid.lang = function() {
'LogicConnectCountDesc' : ['Total connect times from datasource', '产生的逻辑连接建立总数'],
'LogicCloseCountDesc' : ['Total close connect times from datasource', '产生的逻辑连接关闭总数'],
'LogicConnectErrorCountDesc' : ['Total connect error times', '产生的逻辑连接出错总数'],
'RecycleErrorCount' : ['Logic Connection Recycle Count', '逻辑连接回收重用次数'],
'PhysicalConnectCountDesc' : ['Create physical connnection count', '产生的物理连接建立总数'],
'PhysicalCloseCountDesc' : ['Close physical connnection count', '产生的物理关闭总数'],
'PhysicalConnectErrorCountDesc' : ['Total physical connect error times', '产生的物理连接失败总数'],
@@ -121,6 +122,8 @@ druid.lang = function() {
'PSCacheAccessCountDesc' : ['PerpareStatement access count', 'PSCache访问总数'],
'PSCacheHitCountDesc' : ['PerpareStatement hit count', 'PSCache命中次数'],
'PSCacheMissCountDesc' : ['PerpareStatement miss count', 'PSCache不命中次数'],//
'PreparedStatementOpenCount' : ['Real PreparedStatement Open Count', '真实PreparedStatement打开次数'],//
'PreparedStatementClosedCount' : ['Real PreparedStatement Closed Count', '真实PreparedStatement关闭次数'],//
'ConnectionHoldTimeHistogramDesc' : ['The histogram values of connection hold time, [0-1 ms, 1-10 ms, 10-100 ms, 100ms-1s, 1-10 s, 10-100 s, 100-1000 s, >1000 s]', '连接持有时间分布，分布区间为[0-1 ms, 1-10 ms, 10-100 ms, 100ms-1s, 1-10 s, 10-100 s, 100-1000 s, >1000 s]'],
'ClobOpenCountDesc' : ['', 'Clob打开数'],
'BlobOpenCountDesc' : ['', 'Blob打开数'],