Stop redirect stdout/stderr and remove close_fds=True

scripts/slave/recipe_modules/goma/api.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from contextlib import contextmanager
 
 from recipe_engine import recipe_api
 
 class GomaApi(recipe_api.RecipeApi):
   """GomaApi contains helper functions for using goma."""
 
   def __init__(self, **kwargs):
     super(GomaApi, self).__init__(**kwargs)
     self._goma_dir = None
     self._goma_started = False
 
     self._goma_ctl_env = {}
-    self._cloudtail_pid = None
     self._goma_jobs = None
 
   @property
   def service_account_json_path(self):
     if self.m.platform.is_win:
       return 'C:\\creds\\service_accounts\\service-account-goma-client.json'
     return '/creds/service_accounts/service-account-goma-client.json'
 
   @property
   def cloudtail_path(self):
     assert self._goma_dir
     return self.m.path.join(self._goma_dir, 'cloudtail')
 
   @property
+  def cloudtail_pid_file(self):
+    return self.m.path['tmp_base'].join('cloudtail.pid')
+
+  @property
   def json_path(self):
     assert self._goma_dir
     return self.m.path.join(self._goma_dir, 'jsonstatus')
 
   @property
   def recommended_goma_jobs(self):
     """
     Return the recommended number of jobs for parallel build using Goma.
 
     This function caches the _goma_jobs.
@@ skipping 83 matching lines @@
   def build_data_dir(self):
     return self.m.properties.get('build_data_dir')
 
   def _start_cloudtail(self):
     """Start cloudtail to upload compiler_proxy.INFO
 
     Raises:
       InfraFailure if it fails to start cloudtail
     """
 
-    assert self._cloudtail_pid is None
-
-    step_result = self.m.python(
+    self.m.python(
       name='start cloudtail',
       script=self.resource('cloudtail_utils.py'),
       args=['start',
-            '--cloudtail-path', self.cloudtail_path],
+            '--cloudtail-path', self.cloudtail_path,
+            '--pid-file', self.m.raw_io.output(
+                leak_to=self.cloudtail_pid_file)],
       env=self._goma_ctl_env,
-      stdout=self.m.raw_io.output(),
       step_test_data=(
-          lambda: self.m.raw_io.test_api.stream_output('12345')),
+          lambda: self.m.raw_io.test_api.output('12345')),
       infra_step=True)
 
-    self._cloudtail_pid = step_result.stdout
-
   def _stop_cloudtail(self):
     """Stop cloudtail started by _start_cloudtail
 
     Raises:
       InfraFailure if it fails to stop cloudtail
     """
 
-    assert self._cloudtail_pid is not None
-
     self.m.python(
         name='stop cloudtail',
         script=self.resource('cloudtail_utils.py'),
         args=['stop',
-              '--killed-pid', self._cloudtail_pid],
+              '--killed-pid-file', self.cloudtail_pid_file],
         infra_step=True)
 
-    self._cloudtail_pid = None
-
   def start(self, env=None, **kwargs):
     """Start goma compiler_proxy.
 
     A user MUST execute ensure_goma beforehand.
     It is user's responsibility to handle failure of starting compiler_proxy.
     """
     assert self._goma_dir
     assert not self._goma_started
 
     if self.build_data_dir:
@@ skipping 146 matching lines @@
       ninja_log_exit_status = e.retcode
       raise e
     except self.m.step.InfraFailure as e: # pragma: no cover
       ninja_log_exit_status = -1
       raise e
     finally:
       self.stop(ninja_log_outdir=ninja_log_outdir,
                 ninja_log_compiler=ninja_log_compiler,
                 ninja_log_command=ninja_log_command,
                 ninja_log_exit_status=ninja_log_exit_status)