Changeset 31583 for main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

Timestamp:

2017-04-06T20:33:36+12:00 (7 years ago)

Author:

ak19

Message:

GS3ServerThread now uses SafeProcess. And moved the code in Gatherer that stopped the GS3 server in the main thread into the GS3ServerThread as a static stopServer method. Hopefully the static is enough to indicate that it is not part of any specific thread other than the main GLI thread.

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -766 +766 @@
             //thread.start();
 
-            try {
-            String shellCommand = null;
-            Process p = null;
-            if (Utility.isWindows()) {
-                // cmd /C "cd "C:\path\to\greenstone3" && ant stop"
-                p = Runtime.getRuntime().exec("cmd /C \"cd \"" + Configuration.gsdl3_src_path + File.separator + "\" && ant stop\"");   
-            } else {
-                p = Runtime.getRuntime().exec(new String[]{"/bin/bash", "-c", "ant stop -f \"" + Configuration.gsdl3_src_path + File.separator + "build.xml\""});
-            }
-            // doing a p.waitFor() without processing the Process' IOstreams causes blocking with Java 6 
-            // (i.e. when JRE 6 included with GS binaries). However, p.waitFor() with Java 7 is fine.
-            /*if(p != null && p.waitFor() == 0) {
-                DebugStream.println("********** SUCCESSFULLY stopped THE GS3 SERVER ON EXIT");
-            }
-            else {
-                System.err.println("********** FAILED TO SUCCESSFULLY stop THE GS3 SERVER ON EXIT");
-                //throw new Exception ("Failed to successfully stop the GS3 server on exit.");
-            }*/
-            } catch(Exception e) {
-            System.err.println("Exception when trying to stop the tomcat web server: " + e);
-            DebugStream.printStackTrace(e);
-            }
+            GS3ServerThread.stopServer();
             
         }