print output to stdout if doprint is True

fixes #2403

Author: Vladimir Kotal

opengrok-tools/src/main/python/opengrok_tools/all/utils/command.py

@@ -40,7 +40,8 @@ class TimeoutException(Exception):
 class Command:
     """
     wrapper for synchronous execution of commands via subprocess.Popen()
-    and getting their output (stderr is redirected to stdout) and return value
+    and getting their output (stderr is redirected to stdout by default)
+    and exit value
     """
 
     # state definitions
@@ -51,7 +52,7 @@ class Command:
 
     def __init__(self, cmd, args_subst=None, args_append=None, logger=None,
                  excl_subst=False, work_dir=None, env_vars=None, timeout=None,
-                 redirect_stderr=True, resource_limits=None):
+                 redirect_stderr=True, resource_limits=None, doprint=False):
         self.cmd = cmd
         self.state = "notrun"
         self.excl_subst = excl_subst
@@ -61,6 +62,7 @@ def __init__(self, cmd, args_subst=None, args_append=None, logger=None,
         self.pid = None
         self.redirect_stderr = redirect_stderr
         self.limits = resource_limits
+        self.doprint = doprint
 
         self.logger = logger or logging.getLogger(__name__)
         logging.basicConfig()
@@ -144,13 +146,16 @@ class OutputThread(threading.Thread):
             stdout/stderr buffers fill up.
             """
 
-            def __init__(self, event, logger):
+            def __init__(self, event, logger, doprint=False):
                 super(OutputThread, self).__init__()
                 self.read_fd, self.write_fd = os.pipe()
                 self.pipe_fobj = os.fdopen(self.read_fd, encoding='utf8')
                 self.out = []
                 self.event = event
                 self.logger = logger
+                self.doprint = doprint
+
+                # Start the thread now.
                 self.start()
 
             def run(self):
@@ -169,6 +174,9 @@ def run(self):
 
                     self.out.append(line)
 
+                    if self.doprint:
+                        print(line.strip())
+
             def getoutput(self):
                 return self.out
 
@@ -199,15 +207,17 @@ def close(self):
 
         timeout_thread = None
         output_event = threading.Event()
-        output_thread = OutputThread(output_event, self.logger)
+        output_thread = OutputThread(output_event, self.logger,
+                                     doprint=self.doprint)
 
         # If stderr redirection is off, setup a thread that will capture
         # stderr data.
         if self.redirect_stderr:
             stderr_dest = subprocess.STDOUT
         else:
             stderr_event = threading.Event()
-            stderr_thread = OutputThread(stderr_event, self.logger)
+            stderr_thread = OutputThread(stderr_event, self.logger,
+                                         doprint=self.doprint)
             stderr_dest = stderr_thread
 
         try:
@@ -217,9 +227,8 @@ def close(self):
             except PermissionError:
                 pass
             self.logger.debug("command = {}".format(self.cmd))
-            my_args = {}
-            my_args['stderr'] = stderr_dest
-            my_args['stdout'] = output_thread
+            my_args = {'stderr': stderr_dest,
+                       'stdout': output_thread}
             if self.env_vars:
                 my_env = os.environ.copy()
                 my_env.update(self.env_vars)

opengrok-tools/src/main/python/opengrok_tools/all/utils/indexer.py

@@ -42,7 +42,7 @@ class Indexer(Java):
     """
 
     def __init__(self, command, logger=None, java=None, jar='opengrok.jar',
-                 java_opts=None, env_vars=None):
+                 java_opts=None, env_vars=None, doprint=False):
 
         java_options = []
         if java_opts:
@@ -52,7 +52,7 @@ def __init__(self, command, logger=None, java=None, jar='opengrok.jar',
         logger.debug("Java options: {}".format(java_options))
 
         super().__init__(command, jar=jar, java=java, java_opts=java_options,
-                         logger=logger, env_vars=env_vars)
+                         logger=logger, env_vars=env_vars, doprint=doprint)
 
 
 def get_SCM_properties(logger):

opengrok-tools/src/main/python/opengrok_tools/all/utils/java.py

@@ -36,7 +36,7 @@ class Java(Command):
 
     def __init__(self, command, logger=None, main_class=None, java=None,
                  jar=None, java_opts=None, classpath=None, env_vars=None,
-                 redirect_stderr=True):
+                 redirect_stderr=True, doprint=False):
 
         if not java:
             java = self.FindJava(logger)
@@ -71,7 +71,7 @@ def __init__(self, command, logger=None, main_class=None, java=None,
         logger.debug("Java command: {}".format(java_command))
 
         super().__init__(java_command, logger=logger, env_vars=env,
-                         redirect_stderr=redirect_stderr)
+                         redirect_stderr=redirect_stderr, doprint=doprint)
 
     def FindJava(self, logger):
         """

opengrok-tools/src/main/python/opengrok_tools/indexer.py

@@ -63,11 +63,11 @@ def main():
 
     indexer = Indexer(args.options, logger=logger, java=args.java,
                       jar=args.jar, java_opts=args.java_opts,
-                      env_vars=args.environment)
+                      env_vars=args.environment, doprint=True)
     indexer.execute()
     ret = indexer.getretcode()
     if ret is None or ret != 0:
-        logger.error(indexer.getoutputstr())
+        # The output is already printed thanks to 'doprint' above.
         logger.error("Indexer command failed (return code {})".format(ret))
         sys.exit(1)