Author: [log in to unmask]
Date: Thu Nov 13 14:07:57 2014
New Revision: 1512
Log:
Use same db name between jlab and slac. The slac db is considered read only and is replicated from jlab.
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/DatabaseConditionsManager.java
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/DatabaseConditionsManager.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/DatabaseConditionsManager.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/DatabaseConditionsManager.java Thu Nov 13 14:07:57 2014
@@ -100,14 +100,13 @@
// By default, connect to the publicly accessible SLAC database.
this.hostname = "ppa-jeremym-l.slac.stanford.edu";
- this.database = "hps_conditions_dev";
+ this.database = "hps_conditions";
try {
// Are we running from inside the JAB network?
if (InetAddress.getLocalHost().getHostName().contains("jlab.org")) {
// Override the defaults and use parameters for the JLAB database.
- this.hostname = "jmysql.jlab.org";
- this.database = "hps_conditions";
+ this.hostname = "jmysql.jlab.org";
}
} catch (UnknownHostException e) {
// Something wrong with the user's host name, but just assume we can continue okay.
