Revert of Send a SIGKILL to masters after 10 seconds if they don't exit from SIGTERM

masters/master-common-rules.mk

 # -*- makefile -*-
 # Copyright (c) 2012 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.
 
 # This should be included by a makefile which lives in a buildmaster/buildslave
 # directory (next to the buildbot.tac file). That including makefile *must*
 # define MASTERPATH.
 
 # The 'start' and 'stop' targets start and stop the buildbot master.
@@ skipping 73 matching lines @@
 ifndef NO_REVISION_AUDIT
         @($(INFRA_RUNPY) infra.tools.send_monitoring_event \
                    --service-event-type=STOP \
                    --event-mon-run-type=prod \
                    --event-mon-service-name \
                    buildbot/master/$(MASTERPATH) \
    || echo 'Running send_monitoring_event failed, skipping sending events' \
   ) 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;
 
 reconfig: printstep
         kill -HUP `cat twistd.pid`
 
 no-new-builds: notify printstep
         kill -USR1 `cat twistd.pid`
 
@@ skipping 26 matching lines @@
         PYTHONPATH=$(PYTHONPATH) python buildbot upgrade-master .
 
 # This target is only known to be useful on 0.8.x masters.
 bootstrap: printstep
         @[ -e '.dbconfig' ] || [ -e 'state.sqlite' ] || \
         PYTHONPATH=$(PYTHONPATH) python $(SCRIPTS_DIR)/tools/state_create.py \
         --restore --db='state.sqlite' --txt '../state-template.txt'
 
 setup:
         @echo export PYTHONPATH=$(PYTHONPATH)