Changeset 31706 for main/trunk/greenstone3/src

Timestamp:

2017-05-25T19:38:26+12:00 (7 years ago)

Author:

ak19

Message:

On Mac too, not just linux, the exit value of a kill pid cmd can be 1. This can mean the process was already terminated before the kill signal was sent or received. This is what happens when running full-rebuild.pl (but not full-import.pl) on a Mac, so that the process already cleanly terminated on interrupt and sending a TERM signal was unnecessary.

File:

• main/trunk/greenstone3/src/java/org/greenstone/util/SafeProcess.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/util/SafeProcess.java

@@ -803 +803 @@
     }
     return true;
-    } else if(!Misc.isMac() && exitValue == 1) {
+    } else if(exitValue == 1 && proc.getStdOutput().trim().equals("") && proc.getStdError().trim().equals("")) {
     // https://stackoverflow.com/questions/28332888/return-value-of-kill
     // "kill returns an exit code of 0 (true) if the process still existed it and was killed.
@@ -810 +810 @@
     // the process and its subprocesses (don't need to call this method at all to terminate the processes: the processes
     // aren't running when we get to this method)
-    log("@@@ Sending termination signal returned exit value 1. On linux this happens when the process has already been terminated");
+    log("@@@ Sending termination signal returned exit value 1. On unix this happens when the process has already been terminated.");
     return true;
     } else {
-    log("@@@ Not able to successfully terminate process, got exitvalue " + exitValue);
+    log("@@@ Not able to successfully terminate process. Got exitvalue: " + exitValue);
     log("@@@ Got output: |" + proc.getStdOutput() + "|"); 
     log("@@@ Got err output: |" + proc.getStdError() + "|");