Changeset 19441 for greenstone3

Timestamp:

2009-05-13T14:56:16+12:00 (15 years ago)

Author:

ak19

Message:

Uses PortFinder.isPortAvailable() with the new verbose flag and prints out a message saying which port is being used if this is different from what was specified in llssite.cfg.

File:

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

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

@@ -211 +211 @@
     try {
         int portNum = Integer.parseInt(port);
-        boolean silent = true;
-        if(!PortFinder.isPortAvailable(portNum, silent)) {
+        boolean verbose = true;
+        if(!PortFinder.isPortAvailable(portNum, verbose)) { // first time, print any Port Unavailable messages
         
         PortFinder portFinder = new PortFinder(portDefault, 101);
-        portNum = portFinder.findPortInRange(silent);
-        port = (portNum == -1) ? Integer.toString(portDefault) : Integer.toString(portNum);
+        // Search for a free port silently from now on--don't want more
+        // messages saying that a port could not be found...
+        portNum = portFinder.findPortInRange(!verbose);
+        
+        if (portNum == -1) {
+            // If we've still not found a free port, do we try the default port again?
+            System.err.println("No free port found. Going to try on " + portDefault + " anyway.");
+            port = Integer.toString(portDefault);
+        } else {
+            port = Integer.toString(portNum);
+        }
         config_properties.setProperty("portnumber", port); // store the correct port
 
@@ -226 +235 @@
 
         configure_required_ = true;
+        System.err.println("Running server on port " + port + ".");
         }    
     } catch (Exception e) {