Changeset 31716 for main

Show
Ignore:
Timestamp:
30.05.2017 21:23:20 (3 years ago)
Author:
ak19
Message:

Comments adjusted

Location:
main/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/src/org/greenstone/gatherer/util/SafeProcess.java

    r31712 r31716  
    444444        // 2. basic waitFor the process to finish 
    445445        this.exitValue = process.waitFor(); 
    446  
     446         
     447        // 3. if we managed to get here, the process naturally terminated (wasn't interrupted): 
    447448        this.forciblyTerminateProcess = false; 
    448449    } catch(IOException ioe) {       
     
    789790// Kill signals, their names and numerical equivalents: http://www.faqs.org/qa/qa-831.html 
    790791// https://stackoverflow.com/questions/8533377/why-child-process-still-alive-after-parent-process-was-killed-in-linux 
    791 // Didn't work for when build scripts run from GLI: kill -TERM -pid 
    792 // but the other suggestion did work: pkill -TERM -P pid did work 
     792// Works on Linux but not Mac when build scripts run from GLI: kill -TERM -pid 
     793// Works on Macs but not Linux: pkill -TERM -P pid 
    793794// More reading: 
    794795// https://superuser.com/questions/343031/sigterm-with-a-keyboard-shortcut 
  • main/trunk/greenstone3/src/java/org/greenstone/util/SafeProcess.java

    r31712 r31716  
    445445        // 2. basic waitFor the process to finish 
    446446        this.exitValue = process.waitFor(); 
    447  
     447         
     448        // 3. if we managed to get here, the process naturally terminated (wasn't interrupted): 
    448449        this.forciblyTerminateProcess = false; 
    449450    } catch(IOException ioe) {       
     
    790791// Kill signals, their names and numerical equivalents: http://www.faqs.org/qa/qa-831.html 
    791792// https://stackoverflow.com/questions/8533377/why-child-process-still-alive-after-parent-process-was-killed-in-linux 
    792 // Didn't work for when build scripts run from GLI: kill -TERM -pid 
    793 // but the other suggestion did work: pkill -TERM -P pid did work 
     793// Works on Linux but not Mac when build scripts run from GLI: kill -TERM -pid 
     794// Works on Macs but not Linux: pkill -TERM -P pid 
    794795// More reading: 
    795796// https://superuser.com/questions/343031/sigterm-with-a-keyboard-shortcut