Changeset 20623 for greenstone3

Timestamp:

2009-09-17T19:28:47+12:00 (15 years ago)

Author:

ak19

Message:

No more properties hosts in llssite.cfg and glisite.cfg config files. Now the host IP is always written into these and then written into httpd.conf by gsicontrol.sh.

File:

• greenstone3/trunk/src/java/org/greenstone/server/Server2Settings.java (modified) (1 diff)

greenstone3/trunk/src/java/org/greenstone/server/Server2Settings.java

@@ -111 +111 @@
     
     // work out the host (default is address_resolution_method 2: localhost)
-    String hosts = "127.0.0.1 localhost";
-    String fixedHostIP = "127.0.0.1";
+    String hostIP = "127.0.0.1";
     InetAddress inetAddress = null;
     try {
         inetAddress = InetAddress.getLocalHost();
-
-        fixedHostIP = inetAddress.getHostAddress(); // used for all cases unless things go wrong
-        hosts = "127.0.0.1 " + fixedHostIP;         // for address_resolution_methods 1 and 3
-
-        if(address_resolution_method == 2) {
-        hosts = hosts + " localhost";
-        } else if(address_resolution_method == 0) {
-        hosts = hosts + " " + inetAddress.getHostName() + " localhost";
-        }
+        hostIP = inetAddress.getHostAddress(); // used for all cases unless an Exception is thrown here
     } catch(UnknownHostException e) {
         logger.error(e);
-        logger.info("Server2.java reload(): Defaulting host IP to localhost");
-        fixedHostIP = "127.0.0.1";
-        address_resolution_method = 2;
-        hosts = "127.0.0.1 localhost";
+        logger.info("Server2.java reload(): Defaulting host URL to localhost");
+        hostIP = "127.0.0.1";
+        address_resolution_method = 2;      
     }
 
-    newFileLines = scriptReadWrite.queryReplace(newFileLines, "hosts", hosts);
-    newFileLines = scriptReadWrite.queryReplace(newFileLines, "hostIP", fixedHostIP);
+    newFileLines = scriptReadWrite.queryReplace(newFileLines, "hostIP", hostIP);
 
     // address resolution method - onSave() would have updated