Changeset 31587 for main/trunk

Timestamp:

2017-04-06T21:19:10+12:00 (7 years ago)

Author:

ak19

Message:

Changes to GS3 src SafeProcess.java to bring it up to speed with GLI's version (sadly can't be identical because of the lack of logger in GLI). 1. Exceptions are now no longer handled by SafeProcess at all times, but only if no exception hander was registered. 2. cmd string also accepted by SafeProcess constructor. And a new single arg constructor to OutputStreamGobbler.

File:

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

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

@@ -23 +23 @@
     static Logger logger = Logger.getLogger(org.greenstone.util.SafeProcess.class.getName());
 
+    // input to SafeProcess and initialising it
+    private String command = null;
     private String[] command_args = null;
     private String[] envp = null;
@@ -28 +30 @@
     private String inputStr = null;
 
+    // output from running SafeProcess.runProcess()
     private String outputStr = ""; 
     private String errorStr = "";
-
     private int exitValue = -1;
 
@@ -51 +53 @@
     }
 
+    // cmd string version
+    public SafeProcess(String cmdStr)
+    {
+    command = cmdStr;
+    }
+
     // cmd args with env version, launchDir can be null.
     public SafeProcess(String[] cmd_args, String[] envparams, File launchDir)
@@ -96 +104 @@
 
 //***************** Copied from gli's gui/FormatConversionDialog.java *************//
-    public void runProcess() {
+    public int runProcess() {
 
     Process prcs = null;
@@ -105 +113 @@
     try {       
         Runtime rt = Runtime.getRuntime();      
-        
-        // http://stackoverflow.com/questions/5283444/convert-array-of-strings-into-a-string-in-java
-        //logger.info("Running process: " + Arrays.toString(command_args));
-
-        if(this.envp == null) {
-        prcs = rt.exec(this.command_args);
-        } else { // launch process using cmd str with env params        
-
-        if(this.dir == null) {
-            //logger.info("\twith: " + Arrays.toString(this.envp));
-            prcs = rt.exec(this.command_args, this.envp);
-        } else {
-            //logger.info("\tfrom directory: " + this.dir);
-            //logger.info("\twith: " + Arrays.toString(this.envp));
-            prcs = rt.exec(this.command_args, this.envp, this.dir);
+        if(this.command != null) {
+        prcs = rt.exec(this.command);
+        }
+        else { // at least command_args must be set now
+
+        // http://stackoverflow.com/questions/5283444/convert-array-of-strings-into-a-string-in-java
+        ///logger.info("SafeProcess running: " + Arrays.toString(command_args));
+
+        if(this.envp == null) { 
+            prcs = rt.exec(this.command_args);
+        } else { // launch process using cmd str with env params        
+            
+            if(this.dir == null) {
+            logger.info("\twith: " + Arrays.toString(this.envp));
+            prcs = rt.exec(this.command_args, this.envp);
+            } else {
+            logger.info("\tfrom directory: " + this.dir);
+            logger.info("\twith: " + Arrays.toString(this.envp));
+            prcs = rt.exec(this.command_args, this.envp, this.dir);
+            }
         }
         }
@@ -171 +184 @@
        
     } catch(IOException ioe) {
-        logger.error("IOexception: " + ioe.getMessage(), ioe);
-        //System.err.println("IOexception " + ioe.getMessage());
-        //ioe.printStackTrace();
-        if(exceptionHandler != null) exceptionHandler.gotException(ioe);
+        if(exceptionHandler != null) {
+        exceptionHandler.gotException(ioe);
+        } else {
+        logger.error("IOexception: " + ioe.getMessage(), ioe);
+        //System.err.println("IOexception " + ioe.getMessage());
+        //ioe.printStackTrace();
+        }
     } catch(InterruptedException ie) {
-        logger.error("Process InterruptedException: " + ie.getMessage(), ie);
-        //System.err.println("Process InterruptedException " + ie.getMessage());
-        //ie.printStackTrace();
-        if(exceptionHandler != null) exceptionHandler.gotException(ie);
+        if(exceptionHandler != null) {
+        exceptionHandler.gotException(ie);
+        } else {
+        logger.error("Process InterruptedException: " + ie.getMessage(), ie);
+        //System.err.println("Process InterruptedException " + ie.getMessage());
+        //ie.printStackTrace(); // an interrupt here is not an error, it can be a cancel action
+        }
+
 
         // propagate interrupts to worker threads here?
@@ -218 +238 @@
     }
 
+    return this.exitValue;
     }
     
@@ -286 +307 @@
         //System.out.println("@@@ GOT LINE: " + line);
         outputstr.append(line);
+        
         if(split_newlines) {
-            outputstr.append(Misc.NEWLINE); // "\n" is system dependent (Win must be "\r\n")
+            outputstr.append(Utility.NEWLINE); // "\n" is system dependent (Win must be "\r\n")
         }
 
@@ -295 +317 @@
         }
     } catch (IOException ioe) {
-        logger.error("Exception when reading from a process' stdout/stderr stream: ", ioe);
-        if(lineByLineHandler != null) lineByLineHandler.gotException(ioe);
-        //ioe.printStackTrace();  
+        if(lineByLineHandler != null) {
+        lineByLineHandler.gotException(ioe);
+        } else {
+        logger.error("Exception when reading from a process' stdout/stderr stream: ", ioe);
+        //ioe.printStackTrace();
+        }
+        
     } finally {
         SafeProcess.closeResource(br);
@@ -318 +344 @@
     ExceptionHandler exceptionHandler = null;
 
+    public OutputStreamGobbler(OutputStream os) {
+    this.os = os;
+    }
+
     public OutputStreamGobbler(OutputStream os, String inputstr)
     {
@@ -355 +385 @@
         */
     } catch (IOException ioe) {
-        logger.error("Exception writing to SafeProcess' inputstream: ", ioe);       
-        //ioe.printStackTrace();
-
-        if (this.exceptionHandler != null) this.exceptionHandler.gotException(ioe);
+        if (this.exceptionHandler != null) {
+        this.exceptionHandler.gotException(ioe);
+        } else {
+        logger.error("Exception writing to SafeProcess' inputstream: ", ioe);       
+        //ioe.printStackTrace();
+        }
         
     } finally {