Author: [log in to unmask]
Date: Tue Mar 29 16:34:52 2016
New Revision: 4331
Log:
Run db connection management changes (uses data source now).
Modified:
java/branches/jeremy-dev2/run-database/pom.xml
java/branches/jeremy-dev2/run-database/src/main/java/org/hps/run/database/RunManager.java
Modified: java/branches/jeremy-dev2/run-database/pom.xml
=============================================================================
--- java/branches/jeremy-dev2/run-database/pom.xml (original)
+++ java/branches/jeremy-dev2/run-database/pom.xml Tue Mar 29 16:34:52 2016
@@ -23,6 +23,11 @@
<groupId>srs</groupId>
<artifactId>org-srs-datacat-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: java/branches/jeremy-dev2/run-database/src/main/java/org/hps/run/database/RunManager.java
=============================================================================
--- java/branches/jeremy-dev2/run-database/src/main/java/org/hps/run/database/RunManager.java (original)
+++ java/branches/jeremy-dev2/run-database/src/main/java/org/hps/run/database/RunManager.java Tue Mar 29 16:34:52 2016
@@ -7,6 +7,7 @@
import javax.sql.DataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
import org.hps.record.daqconfig.DAQConfig;
import org.hps.record.epics.EpicsData;
import org.hps.record.scalers.ScalerData;
@@ -15,8 +16,6 @@
import org.lcsim.conditions.ConditionsEvent;
import org.lcsim.conditions.ConditionsListener;
-import com.mysql.jdbc.jdbc2.optional.MysqlDataSource;
-
/**
* Manages access to the run database.
*
@@ -63,7 +62,7 @@
*/
private static DataSource createDataSource() {
- MysqlDataSource dataSource = new MysqlDataSource();
+ BasicDataSource dataSource = new BasicDataSource();
// Default settings.
String user = "hpsuser";
@@ -89,27 +88,27 @@
database = System.getProperty(DATABASE_PROPERTY);
}
- dataSource.setUser(user);
- dataSource.setPassword(password);
- dataSource.setServerName(host);
- dataSource.setPort(port);
- dataSource.setDatabaseName(database);
- dataSource.setAutoReconnect(true);
- dataSource.setConnectTimeout(120000);
- try {
- dataSource.setLoginTimeout(120);
- } catch (SQLException e) {
- throw new RuntimeException(e);
- }
-
- StringBuffer sb = new StringBuffer();
- sb.append("user = " + user + '\n');
- sb.append("password = " + password + '\n');
- sb.append("host = " + host + '\n');
- sb.append("port = " + port + '\n');
- sb.append("database = " + database + '\n');
-
- LOGGER.config("Created new rundb data source: " + sb.toString());
+ String uri = "jdbc:mysql://" + host + ":" + port + "/" + database;
+ dataSource.setUsername(user);
+ dataSource.setPassword(password);
+ dataSource.setUrl(uri);
+
+ //dataSource.setAutoReconnect(true);
+ //try {
+ // dataSource.setConnectTimeout(120000);
+ // dataSource.setLoginTimeout(120);
+ //} catch (SQLException e) {
+ // throw new RuntimeException(e);
+ //}
+
+ //StringBuffer sb = new StringBuffer();
+ //sb.append("user = " + user + '\n');
+ //sb.append("password = " + password + '\n');
+ //sb.append("host = " + host + '\n');
+ //sb.append("port = " + port + '\n');
+ //sb.append("database = " + database + '\n');
+
+ LOGGER.config("Created new data source with URI: " + uri);
return dataSource;
}
|