masters/master-common-rules.mk - Issue 1863083003: Revert of Send a SIGKILL to masters after 10 seconds if they don't exit from SIGTERM

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: masters/master-common-rules.mk

Issue 1863083003: Revert of Send a SIGKILL to masters after 10 seconds if they don't exit from SIGTERM (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master

Patch Set: Created 4 years, 8 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

Index: masters/master-common-rules.mk

diff --git a/masters/master-common-rules.mk b/masters/master-common-rules.mk

index c1d96ba28e456e0ed5c984d6954178fd210167aa..a8b72e654c4b338ef119c8dca7894b33327c6d67 100644

--- a/masters/master-common-rules.mk

+++ b/masters/master-common-rules.mk

@@ -91,7 +91,7 @@

) 2>&1 | tee -a actions.log

endif

- $(SCRIPTS_DIR)/master/kill_pidfile.sh twistd.pid

+ if `test -f twistd.pid`; then kill -TERM -$$(ps h -o pgid= $$(cat twistd.pid) | awk '{print $$1}'); fi;

kill: notify printstep

if `test -f twistd.pid`; then kill -KILL -$$(ps h -o pgid= $$(cat twistd.pid) | awk '{print $$1}'); fi;

« no previous file with comments | « no previous file | scripts/master/kill_pidfile.sh » ('j') | no next file with comments »