Changeset 31592 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java

Timestamp:

2017-04-07T18:20:11+12:00 (7 years ago)

Author:

ak19

Message:

Removed unwanted debugging now that Windows testing of the new SafeProcess.CustomProcessHandler related changes worked out successfully too.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java (modified) (7 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java

@@ -335 +335 @@
         // http://www.cgi101.com/class/ch3/text.html
         // setenv QUERY_STRING and REQUEST_METHOD = GET.
-        // Run the perl command as a simple process: no logging to the collection's build log
         if (runPerlCommand(command_str, envvars, new File(cgi_directory)))
                    //new File(GlobalProperties.getGSDL3Home() + File.separator + "WEB-INF" + File.separator + "cgi")))
@@ -402 +401 @@
     }
 
-    // ModifyMetadata operations call runSimplePerlCommand which produces no output in build log
+    // If you want to run a Perl command without doing GS2PerlConstructor's custom logging in the build log
+    // The use the runSimplePerlCommand() versions, which use the default behaviour of running a SafeProcess
     protected boolean runSimplePerlCommand(String[] command) {  
     return runSimplePerlCommand(command, null, null);
@@ -417 +417 @@
     sendMessage(new ConstructionEvent(this, GSStatus.INFO, "command = " + command_str));
     
-    logger.info("### Running simple command = " + command_str);
+    ///logger.info("### Running simple command = " + command_str);
 
     // This is where we create and run our perl process safely
@@ -459 +459 @@
     sendMessage(new ConstructionEvent(this, GSStatus.INFO, "command = " + command_str));
     
-    logger.info("### Running logged command = " + command_str);
+    ///logger.info("### Running logged command = " + command_str);
 
     // This is where we create and run our perl process safely
@@ -526 +526 @@
         // Now display final message based on exit value            
         
-        if (perlProcess.getExitValue() == 0) {  
-        //status = OK;
+        if (perlProcess.getExitValue() == 0) { //status = OK;
+        
         sendProcessStatus(new ConstructionEvent(this, GSStatus.CONTINUING, "Success"));
-        
         success = true;
-        } else {
-        //status = ERROR;
+
+        } else { //status = ERROR;
         sendProcessStatus(new ConstructionEvent(this, GSStatus.ERROR, "Failure"));
-        
-        //return false;
         success = false;
         
         }
-    } else { // cancelled
+    } else { // cancelled. The code would never come here, including in the old version of runPerlCommand
+        // but leaving this here for an exact port of the old runPerlCommand to the new one which
+        // uses SafeProcess. Also to allow the cancel functionality in future
         
         // I need to somehow kill the child process. Unfortunately Thread.stop() and Process.destroy() both fail to do this. But now, thankx to the magic of Michaels 'close the stream suggestion', it works fine.
         sendProcessStatus(new ConstructionEvent(this, GSStatus.HALTED, "killing the process"));
-        //prcs.getOutputStream().close();
-        //prcs.destroy();
-        ////status = ERROR;
-        
-        //return false;
         success = false;
     }
@@ -752 +746 @@
             }
             
-///         System.out.println("@@@ GOT LINE: " + line);
-///         GS2PerlConstructor.logger.info("@@@ GOT LINE: " + line + " STDOUT=1: " + source);
+            ///System.out.println("@@@ GOT LINE: " + line);
+
 
             //if(this.source == STDERR) {
@@ -814 +808 @@
         bwHandle.write(line + "\n");    
         
-///     System.out.println("@@@ WROTE LINE: " + line);
 ///     GS2PerlConstructor.logger.info("@@@ WROTE LINE: " + line);