Changeset 29361 for main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

Timestamp:

2014-10-10T16:59:53+13:00 (10 years ago)

Author:

ak19

Message:

Fix to recent commit that made GS3ServerThread.java do a Process.waitFor(). JRE6 is included in GS binaries. But Java 6 does not work with Process.WaitFor() in GS3ServerThread, as the GS3 server waits to start until after GLI has been quit. Java 7 (JDK and JRE 7) work fine with this. To get Java 6 to work, need to handle the IOstreams of the Process launched by GS3ServerThread. Using the StreamGobbler classes for this.

File:

• main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (2 diffs)

main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -1755 +1755 @@
         GS3ServerThread thread = new GS3ServerThread(Configuration.gsdl3_src_path, "restart");
         thread.start();
-
-        // sleep before returning and doing the configGS3Server: give the GS3 server time to restart    
-        try {
-            Thread.sleep(5000);
-        } catch(Exception e) {
-            e.printStackTrace();
-        }
+        
+        // Give the GS3 server time to restart:
+        // the GS3ServerThread above waits for the process to terminate. ant restart target calls the start-tomcat ant target
+        // and that takes waits 5 seconds and polls to see if a GS3 server index page has loaded. So no need to sleep here      
         
         }
@@ -2038 +2035 @@
         return true;
     }
-
-    if(CollectionManager.isSolrCollection()) {
-        // No installCollection() for GS3 solr collection: activate will take care of that
-        DebugStream.println("Solr collection build complete: building already moved to index by activate.pl.");
-
-        // Finished building,
-        // For now, for a GS3 solr collection, we'd have stopped the GS3 server before building
-        // and will now need to restart it.
-        GS3ServerThread thread = new GS3ServerThread(Configuration.gsdl3_src_path, "restart");
-        thread.start();
-
-        return true;
-    }
-
 
     DebugStream.println("Build complete. Moving files.");