Changeset 32050 for main/trunk

Timestamp:

2017-10-20T19:13:00+13:00 (6 years ago)

Author:

ak19

Message:

Related to previous commit, revision 32049. Now tested successfully on Windows. Suppressing some debug statements.

Location:

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

Files:

• Gatherer.java (modified) (4 diffs)
• util/GS3ServerThread.java (modified) (4 diffs)

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

@@ -411 +411 @@
                         
                         System.err.println("ShutDownHook called...");
-                        System.err.println("Attempting to forcibly terminate the GS server...");
 
                         if (GS3) { // issue the ant call to stop any running GS3
                         // (tomcat and networked Derby Server) by calling GS3ServerThread.stopServer()
                         if(!GS3ServerThread.wasServerLaunchedOutsideGLI()) {
+                            System.err.println("Attempting to forcibly terminate the GS server...");
                             GS3ServerThread.stopServer();
                         } else {
@@ -422 +422 @@
                         } else { // issue the call to stop any running GS2 local library server
                         if (LocalLibraryServer.isRunning() == true) {
+                            System.err.println("Attempting to forcibly terminate the GS server...");
                             LocalLibraryServer.forceStopServer();
                         }
@@ -437 +438 @@
 
                     if(!GS3ServerThread.wasServerLaunchedOutsideGLI()) {
-                    System.err.println("@@@@ Launching tomcat from GLI");
+                    //System.err.println("@@@@ Launching tomcat from GLI");
                     GS3ServerThread thread = new GS3ServerThread(gsdl3_src_path, "restart");
                     thread.start();
@@ -820 +821 @@
             //thread.start();
             if(!GS3ServerThread.wasServerLaunchedOutsideGLI()) {
-            System.err.println("@@@@ Off to call stopServer");
             GS3ServerThread.stopServer();
             } else {

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

@@ -49 +49 @@
     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
+    // isIndependentServer is true if tomcat was already running when GLI was started up
+    // in which case GLI doesn't need start tomcat itself, nor should it need to stop the server on exit
     static private final boolean isIndependentServer = GS3ServerThread.isServerRunning();
-
-    /*static {
-    isIndependentServer = isServerRunning();
-    }*/
     
     public GS3ServerThread(String gsdl3_src_path, String ant_command)
@@ -160 +155 @@
     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 {
@@ -166 +160 @@
     }
     
-    System.err.println("**** Checking if tomcat is running");
+    //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");
+        //System.err.println("**** Tomcat was running");
         return true;
     }
     
-    System.err.println("**** Tomcat was not running");
+    //System.err.println("**** Tomcat was not running");
     return false;
     }
@@ -181 +175 @@
     // first time, call this on startup, before running GS3ServerThread
     public static boolean wasServerLaunchedOutsideGLI() {
-    System.err.println("@@@ Was server launched outside GLI: " + isIndependentServer);
+    //System.err.println("@@@ Was server launched outside GLI: " + isIndependentServer);
     return isIndependentServer;
     }