Author: [log in to unmask]
Date: Tue Dec 2 17:41:27 2014
New Revision: 1634
Log:
Use the right method to get the canonical hostname.
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java Tue Dec 2 17:41:27 2014
@@ -113,9 +113,10 @@
try {
// Are we running inside the JLAB network?
- if (InetAddress.getLocalHost().getHostName().contains("jlab.org")) {
+ if (InetAddress.getLocalHost().getCanonicalHostName().contains("jlab.org")) {
// Use the JLAB database.
- this.hostname = "jmysql.jlab.org";
+ this.hostname = "jmysql.jlab.org";
+ logger.config("found JLAB hostname " + InetAddress.getLocalHost().getCanonicalHostName());
}
} catch (UnknownHostException e) {
// Something wrong with the user's host name, but try to continue anyways.
