Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ECC3D112CF for ; Fri, 1 Aug 2014 09:10:04 +0000 (UTC) Received: (qmail 13149 invoked by uid 500); 1 Aug 2014 09:09:58 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 13014 invoked by uid 500); 1 Aug 2014 09:09:58 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 12020 invoked by uid 99); 1 Aug 2014 09:09:58 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Aug 2014 09:09:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D912A9BCB7E; Fri, 1 Aug 2014 09:09:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rnewson@apache.org To: commits@couchdb.apache.org Date: Fri, 01 Aug 2014 09:10:27 -0000 Message-Id: <77def93f024e40068c59eabde30c11b4@git.apache.org> In-Reply-To: <7ec92bc8976347e8be5a76bf4eac0b9b@git.apache.org> References: <7ec92bc8976347e8be5a76bf4eac0b9b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [31/35] git commit: Kill couch_db_event with supervisor functions Kill couch_db_event with supervisor functions Apparently gen_event ignores unknown kill messages so we'll force a clean shutdown with superisor functions. Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-event/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-event/commit/de231715 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-event/tree/de231715 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-event/diff/de231715 Branch: refs/heads/windsor-merge Commit: de231715e270d685389e0e8e79eed2715bc1e61c Parents: 022af54 Author: Paul J. Davis Authored: Sat Jun 15 13:13:05 2013 -0500 Committer: Robert Newson Committed: Wed Jul 30 17:49:11 2014 +0100 ---------------------------------------------------------------------- src/couch_event_server.erl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch-event/blob/de231715/src/couch_event_server.erl ---------------------------------------------------------------------- diff --git a/src/couch_event_server.erl b/src/couch_event_server.erl index 1bf8f1e..bd291aa 100644 --- a/src/couch_event_server.erl +++ b/src/couch_event_server.erl @@ -126,7 +126,10 @@ watchdog() -> Handlers = gen_event:which_handlers(couch_db_update), case length(Handlers) > 0 of true -> - exit(whereis(couch_db_update), force_upgrade); + supervisor:terminate_child( + couch_primary_services, couch_db_update_event), + supervisor:restart_child( + couch_primary_services, couch_db_update_event); false -> ok end,