Changeset 31813 for main/trunk/gli/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java

Timestamp:

2017-07-21T18:37:30+12:00 (7 years ago)

Author:

ak19

Message:

Adding shutdownhook for GS2 to ensure the GS2 server is stopped on Ctrl-C. Tested on Linux.

File:

• main/trunk/gli/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java (modified) (3 diffs)

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

@@ -38 +38 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.util.PortFinder;
+import org.greenstone.gatherer.util.SafeProcess;
 import org.greenstone.gatherer.util.Utility;
 
@@ -399 +400 @@
     if (isPersistentServer) {
         config(QUIT_COMMAND);
-    } else {        
+    } else {
         boolean success = sendMessageToServer("QUIT\n");
         try {
@@ -451 +452 @@
 
     running = false;
+    }
+
+    // This method does the approximate equivalent of util.GSServerThread.stopServer()
+    // On unexpected, unnatural termination of GLI, call this to send the web-stop message the local library server to stop
+    static public void forceStopServer() {
+    SafeProcess p = null;
+    if (Utility.isWindows()) {
+        // cmd /C "cd "C:\path\to\greenstone3" && ant stop"
+        p = new SafeProcess("cmd /C \"cd \"" + Configuration.gsdl_path + File.separator + "\" && gsicontrol.bat web-stop\"");   
+    } else {
+        p = new SafeProcess(new String[]{"/bin/bash", "-c", "cd \"" + Configuration.gsdl_path + "\" && ./gsicontrol.sh web-stop"});
+    }
+    int result = p.runProcess();
+    if(result == 0) {
+        System.err.println("Successfully stopped GS2 server.");
+        //DebugStream.println("********** SUCCESSFULLY stopped THE GS2 SERVER ON EXIT");
+    }
+    else {
+        System.err.println("********** FAILED TO SUCCESSFULLY stop THE GS2 SERVER ON EXIT");
+    }
+    p = null;
     }