litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1509 connection pool size configuration

Browse source
This commit is contained in:
bjl23 2010-12-13 15:24:40 +00:00
parent 85d7db23e5
commit ca2d8dfb4c
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java
View file

@ -32,13 +32,14 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.RegeneratingGraph;
import edu.cornell.mannlib.vitro.webapp.dao.jena.SDBGraphGenerator; import edu.cornell.mannlib.vitro.webapp.dao.jena.SDBGraphGenerator;
import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroJenaModelMaker; import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroJenaModelMaker;
import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroJenaSDBModelMaker; import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroJenaSDBModelMaker;
import edu.cornell.mannlib.vitro.webapp.utils.StringUtils;
public class JenaDataSourceSetupBase extends JenaBaseDaoCon { public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
private static final Log log = LogFactory.getLog(JenaDataSourceSetupBase.class); private static final Log log = LogFactory.getLog(JenaDataSourceSetupBase.class);
protected final static int DEFAULT_MAXWAIT = 10000, // ms protected final static int DEFAULT_MAXWAIT = 10000, // ms
DEFAULT_MAXACTIVE = 300, DEFAULT_MAXACTIVE = 300,
DEFAULT_MAXIDLE = 84, DEFAULT_MAXIDLE = 30,
DEFAULT_TIMEBETWEENEVICTIONS = 30 * 60 * 1000, // ms DEFAULT_TIMEBETWEENEVICTIONS = 30 * 60 * 1000, // ms
DEFAULT_TESTSPEREVICTION = 3, DEFAULT_TESTSPEREVICTION = 3,
DEFAULT_MINEVICTIONIDLETIME = 1000 * 60 * 30; // ms DEFAULT_MINEVICTIONIDLETIME = 1000 * 60 * 30; // ms
@ -154,7 +155,18 @@ public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
ds.setUrl(jdbcUrl); ds.setUrl(jdbcUrl);
ds.setUsername(username); ds.setUsername(username);
ds.setPassword(password); ds.setPassword(password);
ds.setMaxActive(DEFAULT_MAXACTIVE); int maxActiveInt = DEFAULT_MAXACTIVE;
String maxActiveStr = ConfigurationProperties
.getProperty("VitroConnection.DataSource.pool.maxActive");
if (!StringUtils.isEmpty(maxActiveStr)) {
try {
maxActiveInt = Integer.parseInt(maxActiveStr);
} catch (NumberFormatException nfe) {
log.error("Unable to parse connection pool maxActive setting "
+ maxActiveStr + " as an integer");
}
}
ds.setMaxActive(maxActiveInt);
ds.setMaxIdle(DEFAULT_MAXIDLE); ds.setMaxIdle(DEFAULT_MAXIDLE);
ds.setMaxWait(DEFAULT_MAXWAIT); ds.setMaxWait(DEFAULT_MAXWAIT);
ds.setValidationQuery(DEFAULT_VALIDATIONQUERY); ds.setValidationQuery(DEFAULT_VALIDATIONQUERY);