Always use ensure_start to ensure goma's daemon runs

Recent goma client automatically restarts when GOMA_*
environment variable changes. http://b/25676777 was fixed
2 months ago, so there wouldn't be old goma client.

Change-Id: I3b5419ce4bae4cf8180d8d0a53d2b4218d317fec
This commit is contained in:
Shinichiro Hamaji 2016-04-12 18:14:28 +09:00
parent 8a547f19b8
commit 91609e249a
1 changed files with 1 additions and 5 deletions

View File

@ -46,11 +46,7 @@ ifneq ($(filter-out false,$(USE_GOMA)),)
# gomacc can start goma client's daemon process automatically, but
# it is safer and faster to start up it beforehand. We run this as a
# background process so this won't slow down the build.
# We use "ensure_start" command when the compiler_proxy is already
# running and uses GOMA_HERMETIC=error flag. The compiler_proxy will
# restart otherwise.
# TODO(hamaji): Remove this condition after http://b/25676777 is fixed.
$(shell ( if ( curl http://localhost:$$($(GOMA_CC) port)/flagz | grep GOMA_HERMETIC=error ); then cmd=ensure_start; else cmd=restart; fi; GOMA_HERMETIC=error $(goma_ctl) $${cmd} ) &> /dev/null &)
$(shell ( GOMA_HERMETIC=error $(goma_ctl) ensure_start ) &> /dev/null &)
goma_ctl :=
goma_dir :=