Changeset 31712

Timestamp:

2017-05-29T18:49:10+12:00 (7 years ago)

Author:

ak19

Message:

Logging on exception should happen regardless of whether the DEBUG flag is on or not. Exceptions are not debugging information. Also made some minor changes to a few comments.

Location:

main/trunk

Files:

• gli/src/org/greenstone/gatherer/util/SafeProcess.java (modified) (4 diffs)
• greenstone3/src/java/org/greenstone/util/SafeProcess.java (modified) (4 diffs)

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

@@ -917 +917 @@
     /*
     // On Macs (all Unix?) can't get the child processes of a process once it's been destroyed
-    macTerminateSubProcessesRecursively(pid, p); // pid, true)  
+    macTerminateSubProcessesRecursively(pid, p);
     */
     
     if(pid == -1) {
-        p.destroy(); // at minimum, will have no effect if the process had already terminated 
+        p.destroy(); // at minimum. Will have no effect if the process had already terminated 
     } else {
         boolean forceKill = true;
@@ -936 +936 @@
 
 
-// UNUSED and INCOMPLETE
+// UNUSED and INCOMPLETE METHOD
 // But if this method is needed, then need to parse childpids printed by "pgrep -P pid" and write recursive step
 // The childpids are probably listed one per line, see https://unix.stackexchange.com/questions/117227/why-pidof-and-pgrep-are-behaving-differently
@@ -1422 +1422 @@
 
     public static void log(String msg, Exception e) { // Print stack trace on the exception
-    if(DEBUG == 0) return;
     //logger.error(msg, e);
 
@@ -1433 +1432 @@
 
     public static void log(Exception e) {
-    if(DEBUG == 0) return;      
     //logger.error(e);
 

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

@@ -918 +918 @@
     /*
     // On Macs (all Unix?) can't get the child processes of a process once it's been destroyed
-    macTerminateSubProcessesRecursively(pid, p); // pid, true)  
+    macTerminateSubProcessesRecursively(pid, p);
     */
     
     if(pid == -1) {
-        p.destroy(); // at minimum, will have no effect if the process had already terminated 
+        p.destroy(); // at minimum. Will have no effect if the process had already terminated 
     } else {
         boolean forceKill = true;
@@ -937 +937 @@
 
 
-// UNUSED and INCOMPLETE
+// UNUSED and INCOMPLETE METHOD
 // But if this method is needed, then need to parse childpids printed by "pgrep -P pid" and write recursive step
 // The childpids are probably listed one per line, see https://unix.stackexchange.com/questions/117227/why-pidof-and-pgrep-are-behaving-differently
@@ -1423 +1423 @@
 
     public static void log(String msg, Exception e) { // Print stack trace on the exception
-    if(DEBUG == 0) return;
     logger.error(msg, e);
 
@@ -1434 +1433 @@
 
     public static void log(Exception e) {
-    if(DEBUG == 0) return;      
     logger.error(e);