Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id F28BF200C39 for ; Wed, 1 Mar 2017 17:38:02 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id EFE60160B7F; Wed, 1 Mar 2017 16:38:02 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 21D2B160B85 for ; Wed, 1 Mar 2017 17:38:01 +0100 (CET) Received: (qmail 73902 invoked by uid 500); 1 Mar 2017 16:38:00 -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 73594 invoked by uid 99); 1 Mar 2017 16:38:00 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Mar 2017 16:38:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EF5F1E95D9; Wed, 1 Mar 2017 16:37:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kocolosk@apache.org To: commits@couchdb.apache.org Date: Wed, 01 Mar 2017 16:38:14 -0000 Message-Id: In-Reply-To: <925479a7649544f8927df3a0988e9cee@git.apache.org> References: <925479a7649544f8927df3a0988e9cee@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/50] fabric commit: updated refs/heads/2971-count-distinct to 5d18415 archived-at: Wed, 01 Mar 2017 16:38:03 -0000 Avoid throwing exception when deleting db in db updater listener Handle db deletion explicitly. Previously handle_db_event callback returned `{stop, St}`. That return value was not handled by the caller, instead it resulted in it being used as reason in an erlang:error, which then ended up in the log. Jira: COUCHDB-3149 Project: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/commit/b5340347 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/tree/b5340347 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/diff/b5340347 Branch: refs/heads/2971-count-distinct Commit: b5340347294ac8047619df23b1586774d22e5b71 Parents: f84750e Author: Nick Vatamaniuc Authored: Thu Sep 15 11:16:19 2016 -0400 Committer: Nick Vatamaniuc Committed: Thu Sep 15 11:16:19 2016 -0400 ---------------------------------------------------------------------- src/fabric_db_update_listener.erl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/b5340347/src/fabric_db_update_listener.erl ---------------------------------------------------------------------- diff --git a/src/fabric_db_update_listener.erl b/src/fabric_db_update_listener.erl index 074ec53..1fd9254 100644 --- a/src/fabric_db_update_listener.erl +++ b/src/fabric_db_update_listener.erl @@ -84,7 +84,8 @@ handle_db_event(_DbName, updated, #cb_state{notify = true} = St) -> erlang:send(St#cb_state.client_pid, {St#cb_state.client_ref, db_updated}), {ok, St}; handle_db_event(_DbName, deleted, St) -> - {stop, St}; + erlang:send(St#cb_state.client_pid, {St#cb_state.client_ref, db_deleted}), + stop; handle_db_event(_DbName, _Event, St) -> {ok, St}. @@ -155,6 +156,8 @@ handle_message(db_updated, _Worker, #acc{state=waiting}=Acc) -> {ok, Acc#acc{state=unset}}; handle_message(db_updated, _Worker, Acc) -> {ok, Acc#acc{state=updated}}; +handle_message(db_deleted, _Worker, Acc) -> + {stop, ok}; handle_message(get_state, _Worker, #acc{state=unset}=Acc) -> {ok, Acc#acc{state=waiting}}; handle_message(get_state, _Worker, Acc) ->