Changeset 31813 for main/trunk/gli/src

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.

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (2 diffs)
• greenstone/LocalLibraryServer.java (modified) (3 diffs)

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

@@ -383 +383 @@
                 if (!GS3) {     
                     isLocalLibrary = LocalLibraryServer.start(gsdl_path, local_library_path);
+
+                    // Add a shutdown hook to take care of Ctrl-C situations
+                    // Sadly, neither the shutdownhook for GS3 nor for GS2 ever gets called on Windows
+                    // when a Ctrl-C is sent to the DOS prompt that launched GLI:
+                    // GLI on Windows currently waits to respond to a Ctrl-C until after GLI is already (properly) exited
+                    Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
+                        public void run() {
+
+                            if(Gatherer.exit != true) { // unexpected termination, such as Ctrl-C won't set Gatherer.exit
+                            // so still need to at least issue the call to stop any running GS2 local library server
+                            System.err.println("ShutDownHook called...");
+                            System.err.println("Attempting to forcibly terminate the GS2 server...");
+                            
+                            if (LocalLibraryServer.isRunning() == true) {
+                                LocalLibraryServer.forceStopServer();
+                            }
+
+                            
+                            } else {
+                            System.err.println("Gatherer.exit is false");
+                            }
+                        }
+                        }));
+                    
                 }
                 else if (!isGsdlRemote) { // local GS3, start the local tomcat
@@ -394 +418 @@
                     // https://coderanch.com/t/328888/java/Killing-process-spawned-Runtime-exec
                     Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
-                        public void run() {                     
+                        public void run() {                         
 
                             if(Gatherer.exit != true) { // unexpected termination, such as Ctrl-C won't set Gatherer.exit

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;
     }