Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Unified Diff: scripts/slave/recipe_modules/goma/api.py

Issue 2375843005: Stop redirect stdout/stderr and remove close_fds=True (Closed)
Patch Set: use file for pid Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/goma/example.expected/linux.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/goma/api.py
diff --git a/scripts/slave/recipe_modules/goma/api.py b/scripts/slave/recipe_modules/goma/api.py
index 7844de454e2328f47d9a0027cc5423b5d8a092ea..26e0a7a83b67ba370b45c9ec3ca894db5c735715 100644
--- a/scripts/slave/recipe_modules/goma/api.py
+++ b/scripts/slave/recipe_modules/goma/api.py
@@ -133,21 +133,18 @@ print jobs
InfraFailure if it fails to start cloudtail
"""
- assert self._cloudtail_pid is None
-
step_result = 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.m.path['tmp_base'].join('pid.txt'))],
ukai 2016/09/29 07:55:01 cloudtail.pid?
tikuta 2016/09/29 08:00:50 Done.
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
@@ -155,13 +152,11 @@ print jobs
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.m.path['tmp_base'].join('pid.txt')],
ukai 2016/09/29 07:55:01 cloudtail.pid?
tikuta 2016/09/29 08:00:50 Done.
infra_step=True)
self._cloudtail_pid = None
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/goma/example.expected/linux.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698