Changeset 32429 for main/trunk/greenstone3/src/java/org/greenstone/server/Server3.java

Timestamp:

2018-09-06T22:32:58+12:00 (6 years ago)

Author:

ak19

Message:

solr should only be accessible locally (from localhost, specifically 127.0.0.1) which means over http. This conflicted with the previous design of the properties file for working with http and/or https. Now we have tomcat.port.https and localhost.port.http, both always set. In place of server.protocol that used to contain the default protocol, we now have server.protocols which can be set to a comma separated list of one or both of http and https. Drastic restructuring followed. I think I've tested all but https certification stuff.

File:

• main/trunk/greenstone3/src/java/org/greenstone/server/Server3.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/server/Server3.java

@@ -28 +28 @@
             protocolPortProps = new ProtocolPortProperties(config_properties);
         } catch(Exception e) {
-            String errorMsg = "Error with port/protocol in " + config_properties_file + ": " + protocolPortProps.getErrorMsg();
+            String errorMsg = "@@@ Error with ports/protocol in " + config_properties_file + ": " + e.getMessage();
 
             // print it everywhere, because port/protocol misconfiguration is a fatal error and we're exiting
-            logger_.error(errorMsg);
+            logger_.error(errorMsg, e);
             System.err.println(errorMsg);
             // If error, then quit this app as soon as possible
@@ -37 +37 @@
         }
         
-        Property = protocolPortProps.legacyMode ? new Server3Property() : new Server3Property(protocolPortProps.getProtocol());
+        Property = new Server3Property(protocolPortProps.getDefaultPortPropertyName()); 
+               // defaultPortPropertyName can be 'localhost.port.http' or 'tomcat.port.https'
+               // depending on which of http and https is the first value of 'server.protocols'
 
         String frame_title = dictionary.get("ServerControl.Frame_Title");