Updated Branches: refs/heads/master 862d8ae43 -> 818ef4f9a
taking changes from 1.2 to stop service Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f75b8ab5 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f75b8ab5 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f75b8ab5 Branch: refs/heads/master Commit: f75b8ab53a1868ad2c87a314059226efab018ded Parents: 862d8ae Author: dileepbapat <[email protected]> Authored: Tue May 14 18:08:08 2013 +0530 Committer: Dave Cottlehuber <[email protected]> Committed: Tue Dec 3 20:35:19 2013 +0100 ---------------------------------------------------------------------- bin/couchdb.tpl.in | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/f75b8ab5/bin/couchdb.tpl.in ---------------------------------------------------------------------- diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in index 6ebacf4..538ebcb 100644 --- a/bin/couchdb.tpl.in +++ b/bin/couchdb.tpl.in @@ -304,6 +304,10 @@ stop_couchdb () { PID=`_get_pid` STOP_TIMEOUT=60 if test -n "$PID"; then + if test "$1" = "false"; then + echo > $PID_FILE + fi + if kill -0 $PID 2> /dev/null; then if kill -TERM $PID 2> /dev/null; then count=0
