Changeset 19428 for greenstone3

Timestamp:

2009-05-13T13:52:42+12:00 (15 years ago)

Author:

ak19

Message:

Made Server2.java run PortFinder.isPortAvailable() check in new silent mode that only displays real error messages instead of the quasi-debug messages.

Location:

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

Files:

• PortFinder.java (modified) (4 diffs)
• Server2.java (modified) (1 diff)

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

@@ -28 +28 @@
     this( PORTS_RESERVED+1, (MAX_PORT - PORTS_RESERVED) );
     }
-        
+
     public PortFinder(int base, int blocksize) {
     PORT_BASE = base;
@@ -46 +46 @@
      *  @return the number of an available port.    
      */
-    public int findPortInRange() throws Exception { 
+    public int findPortInRange(boolean silent) throws Exception {   
     try {
         boolean foundFreePort = false;
         for(int i = 0; i < PORT_BLOCK_SIZE; i++) {
         
-        if(isPortAvailable(nextFreePort)) {
+        if(isPortAvailable(nextFreePort, silent)) {
             foundFreePort = true;
             break;
@@ -107 +107 @@
 
     /** @return true if the portnum is available for use */
-    public static boolean isPortAvailable(int portnum) {
+    public static boolean isPortAvailable(int portnum, boolean silent) {
     ServerSocket tmpSocket = null;
     try {
         tmpSocket = new ServerSocket(portnum);
         tmpSocket.close();
-        //System.err.println("Port " + portnum + " not yet in use.");
+        if(!silent) {
+        System.err.println("Port " + portnum + " not yet in use.");
+        }
         return true;
         
@@ -119 +121 @@
         // socket to a local address and port. Typically, the port is 
         // in use, or the requested local address could not be assigned."
-        System.err.println("Port " + portnum + " already in use or can't be assigned.");
+        if(!silent) {
+        System.err.println("Port " + portnum + " already in use or can't be assigned.");
+        }
         tmpSocket = null;
         return false;       

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

@@ -211 +211 @@
     try {
         int portNum = Integer.parseInt(port);
-        
-        if(!PortFinder.isPortAvailable(portNum)) {
+        boolean silent = true;
+        if(!PortFinder.isPortAvailable(portNum, silent)) {
         
         PortFinder portFinder = new PortFinder(portDefault, 101);
-        portNum = portFinder.findPortInRange();
+        portNum = portFinder.findPortInRange(silent);
         port = (portNum == -1) ? Integer.toString(portDefault) : Integer.toString(portNum);
         config_properties.setProperty("portnumber", port); // store the correct port