Chromium Code Reviews| 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 |