Author: [log in to unmask]
Date: Fri Mar 11 13:47:51 2016
New Revision: 4290
Log:
Make sure ConditionsDriver works properly by setting run and detector on main ConditionsSetup object in job mgr.
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsDriver.java
java/trunk/job/src/main/java/org/hps/job/DatabaseConditionsManagerSetup.java
java/trunk/job/src/main/java/org/hps/job/JobManager.java
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsDriver.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsDriver.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsDriver.java Fri Mar 11 13:47:51 2016
@@ -145,4 +145,12 @@
public final void setXmlConfigResource(final String xmlConfigResource) {
this.xmlConfigResource = xmlConfigResource;
}
+
+ public int getRunNumber() {
+ return this.runNumber;
+ }
+
+ public String getDetectorName() {
+ return this.detectorName;
+ }
}
Modified: java/trunk/job/src/main/java/org/hps/job/DatabaseConditionsManagerSetup.java
=============================================================================
--- java/trunk/job/src/main/java/org/hps/job/DatabaseConditionsManagerSetup.java (original)
+++ java/trunk/job/src/main/java/org/hps/job/DatabaseConditionsManagerSetup.java Fri Mar 11 13:47:51 2016
@@ -107,7 +107,7 @@
/**
* Do cleanup of conditions system after job.
* <p>
- * Shuts down the database connections to the run manager and conditions manager, if necessary.
+ * Shuts down the database connection to the conditions manager.
*/
@Override
public void cleanup() {
@@ -124,11 +124,6 @@
LOGGER.log(Level.WARNING, e.getMessage(), e);
}
- // Close the run manager connection.
- if (enableRunManager) {
- RunManager.getRunManager().closeConnection();
- }
-
LOGGER.config("done cleaning up");
}
}
Modified: java/trunk/job/src/main/java/org/hps/job/JobManager.java
=============================================================================
--- java/trunk/job/src/main/java/org/hps/job/JobManager.java (original)
+++ java/trunk/job/src/main/java/org/hps/job/JobManager.java Fri Mar 11 13:47:51 2016
@@ -82,7 +82,9 @@
super.setupDrivers();
for (Driver driver : this.getDriverExecList()) {
if (driver instanceof ConditionsDriver) {
- ((ConditionsDriver) driver).initialize();
+ ConditionsDriver conditions = (ConditionsDriver) driver;
+ getConditionsSetup().setRun(conditions.getRunNumber());
+ getConditionsSetup().setDetectorName(conditions.getDetectorName());
break;
}
}
|