Changeset 32049 for main

Timestamp:

2017-10-20T15:50:51+13:00 (6 years ago)

Author:

ak19

Message:

User on mailing list found it frustrating that GLI stops the GS3 Server on exit. Gli tends to launch and stop the GS3 server on GLI start and quit. Now it first checks if the server was already running on startup (launched externally) and only launches and stops the GS3 server if a server had not been launched external to GLI on GLI startup.

Location:

main/trunk

Files:

• gli/src/org/greenstone/gatherer/Gatherer.java (modified) (3 diffs)
• gli/src/org/greenstone/gatherer/util/GS3ServerThread.java (modified) (2 diffs)
• greenstone3/build.xml (modified) (1 diff)

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

@@ -415 +415 @@
                         if (GS3) { // issue the ant call to stop any running GS3
                         // (tomcat and networked Derby Server) by calling GS3ServerThread.stopServer()
-                        GS3ServerThread.stopServer();
+                        if(!GS3ServerThread.wasServerLaunchedOutsideGLI()) {
+                            GS3ServerThread.stopServer();
+                        } else {
+                            System.err.println("@@@ Tomcat was launched outside GLI. Leaving it running...");
+                        }
                         } else { // issue the call to stop any running GS2 local library server
                         if (LocalLibraryServer.isRunning() == true) {
@@ -431 +435 @@
                 }
                 else { // local GS3, start the local tomcat
-                    
+
+                    if(!GS3ServerThread.wasServerLaunchedOutsideGLI()) {
+                    System.err.println("@@@@ Launching tomcat from GLI");
                     GS3ServerThread thread = new GS3ServerThread(gsdl3_src_path, "restart");
                     thread.start();
-    
-
-
+                    }
+                    
                     // If fedora installed inside this local GS3, then ask for fedora login details now.
                     if (fedora_info.isActive()) { 
@@ -814 +819 @@
             //GS3ServerThread thread = new GS3ServerThread(Configuration.gsdl_path, "stop");
             //thread.start();
-
-            GS3ServerThread.stopServer();
+            if(!GS3ServerThread.wasServerLaunchedOutsideGLI()) {
+            System.err.println("@@@@ Off to call stopServer");
+            GS3ServerThread.stopServer();
+            } else {
+            System.err.println("@@@ Tomcat was launched outside GLI. Leaving it running...");
+            }
             
         }

main/trunk/gli/src/org/greenstone/gatherer/util/GS3ServerThread.java

@@ -48 +48 @@
     String _gsdl3_src_path = "";
     String _ant_command = "";
+
+    // isIndependentServer is true/1 if tomcat was already running when GLI was started up
+    // in which case GLI doesn't need to ask tomcat to be run, nor does it need to stop the server on exit
+    // Value can be -1, 0 or 1. -1 means not yet determined. 0 is false, 1 is true
+    static private final boolean isIndependentServer = GS3ServerThread.isServerRunning();
+
+    /*static {
+    isIndependentServer = isServerRunning();
+    }*/
     
     public GS3ServerThread(String gsdl3_src_path, String ant_command)
     {
     _gsdl3_src_path = gsdl3_src_path;
-    _ant_command = ant_command; // "restart"
+    _ant_command = ant_command; // "restart"    
     }
     
@@ -145 +154 @@
     
     }
+
+    public static boolean isServerRunning() {
+    String antCmd = "ant verbose-check-tomcat-running";
+    
+    SafeProcess p = null;
+    if (Utility.isWindows()) {
+        // cmd /C "cd "C:\path\to\greenstone3" && ant stop"
+        p = new SafeProcess("cmd /C \"cd \"" + Configuration.gsdl3_src_path + File.separator + "\" && "+antCmd+"\"");   
+    } else {
+        p = new SafeProcess(new String[]{"/bin/bash", "-c", antCmd+" -f \"" + Configuration.gsdl3_src_path + File.separator + "build.xml\""});
+    }
+    
+    System.err.println("**** Checking if tomcat is running");
+    p.runProcess();
+    String output = p.getStdOutput();
+
+    if(output.contains("Tomcat is running: true")) {
+        System.err.println("**** Tomcat was running");
+        return true;
+    }
+    
+    System.err.println("**** Tomcat was not running");
+    return false;
+    }
+    
+    // first time, call this on startup, before running GS3ServerThread
+    public static boolean wasServerLaunchedOutsideGLI() {
+    System.err.println("@@@ Was server launched outside GLI: " + isIndependentServer);
+    return isIndependentServer;
+    }
 }

main/trunk/greenstone3/build.xml

@@ -1724 +1724 @@
     </condition>
   </target>
+  
+  <!--
+      <target name="verbose-check-tomcat-running">
+      <condition property="tomcat.isrunning" value="true" else="false">
+      <http url="${server.protocol}://${tomcat.server}:${tomcat.port}"/>
+      </condition>
+      <echo>Tomcat is running: ${tomcat.isrunning}</echo>
+      </target>
+  -->
+  <target name="verbose-check-tomcat-running" depends="check-tomcat-running">   
+    <if>
+      <bool>
+    <istrue value="${tomcat.isrunning}"/>
+      </bool>      
+      <echo>Tomcat is running: ${tomcat.isrunning}</echo>
+      <else><echo>Tomcat is running: false</echo></else><!-- tomcat.isrunning not set -->
+    </if>
+  </target>  
   
   <!-- Need a copy of the check-tomcat-running target with a distinct property, because ant restart runs