This commit is contained in:
温少
2012-03-20 06:14:06 +08:00
parent a26954e672
commit aaa2e474a5
8 changed files with 53 additions and 38 deletions
@@ -55,6 +55,7 @@ import com.alibaba.druid.proxy.DruidDriver;
import com.alibaba.druid.proxy.jdbc.DataSourceProxyConfig;
import com.alibaba.druid.proxy.jdbc.TransactionInfo;
import com.alibaba.druid.stat.DruidDataSourceStatManager;
import com.alibaba.druid.stat.JdbcDataSourceStat;
import com.alibaba.druid.util.JdbcUtils;
/**
@@ -108,6 +109,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
private boolean closed = false;
private JdbcDataSourceStat dataSourceStat;
public DruidDataSource(){
}
@@ -324,6 +327,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
} else if (realDriverClassName.equals("com.alibaba.druid.mock.MockDriver")) {
this.exceptionSorter = new MockExceptionSorter();
}
dataSourceStat = new JdbcDataSourceStat(this.name, this.jdbcUrl);
for (Filter filter : filters) {
filter.init(this);
@@ -1359,4 +1364,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
return VERSION.MajorVersion + "." + VERSION.MinorVersion + "." + VERSION.RevisionVersion;
}
@Override
public JdbcDataSourceStat getDataSourceStat() {
return dataSourceStat;
}
}
@@ -30,6 +30,7 @@ import com.alibaba.druid.pool.ha.config.ConfigLoader;
import com.alibaba.druid.pool.ha.valid.DataSourceFailureDetecter;
import com.alibaba.druid.pool.ha.valid.DefaultDataSourceFailureDetecter;
import com.alibaba.druid.proxy.jdbc.DataSourceProxy;
import com.alibaba.druid.stat.JdbcDataSourceStat;
import com.alibaba.druid.util.JdbcUtils;
public class MultiDataSource extends DataSourceAdapter implements MultiDataSourceMBean, DataSourceProxy {
@@ -83,6 +84,8 @@ public class MultiDataSource extends DataSourceAdapter implements MultiDataSourc
private Balancer balancer = new WeightBalancer();
private JdbcDataSourceStat dataSourceStat;
public long getMaxWaitMillis() {
return maxWaitMillis;
}
@@ -168,9 +171,11 @@ public class MultiDataSource extends DataSourceAdapter implements MultiDataSourc
if (inited) {
return;
}
dataSourceStat = new JdbcDataSourceStat(name, null);
this.balancer.init(this);
initInternal();
scheduler = Executors.newScheduledThreadPool(schedulerThreadCount);
@@ -323,7 +328,7 @@ public class MultiDataSource extends DataSourceAdapter implements MultiDataSourc
if (!this.balancer.isInited()) {
this.balancer.init(this);
}
this.balancer.afterDataSourceChanged(null);
}
@@ -491,4 +496,9 @@ public class MultiDataSource extends DataSourceAdapter implements MultiDataSourc
}
}
@Override
public JdbcDataSourceStat getDataSourceStat() {
return dataSourceStat;
}
}