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 D6B2011B4D for ; Thu, 28 Aug 2014 12:11:47 +0000 (UTC) Received: (qmail 4540 invoked by uid 500); 28 Aug 2014 12:11:38 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 4386 invoked by uid 500); 28 Aug 2014 12:11:38 -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 3740 invoked by uid 99); 28 Aug 2014 12:11:38 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Aug 2014 12:11:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2D12DA02BC0; Thu, 28 Aug 2014 12:11:38 +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: Thu, 28 Aug 2014 12:11:53 -0000 Message-Id: <0cf6a09f2dec47a98662f82e828ff945@git.apache.org> In-Reply-To: <149709301f134b60b82ddbd5d3fa6544@git.apache.org> References: <149709301f134b60b82ddbd5d3fa6544@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [17/50] couch commit: updated refs/heads/master to 9d0ac7d Don't match on response from couch_stats_collector:decrement/1 Margaret's calls aren't always going to return `ok`, so we need to be a bit more defensive here. Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/936e74b1 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/936e74b1 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/936e74b1 Branch: refs/heads/master Commit: 936e74b1b3baf0ec784c7f755e391f08d2621af0 Parents: c903fd2 Author: Benjamin Anderson Authored: Wed Nov 20 19:02:27 2013 -0800 Committer: Robert Newson Committed: Thu Aug 28 13:00:00 2014 +0100 ---------------------------------------------------------------------- src/couch_stats_collector.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/936e74b1/src/couch_stats_collector.erl ---------------------------------------------------------------------- diff --git a/src/couch_stats_collector.erl b/src/couch_stats_collector.erl index 99814de..2ed647c 100644 --- a/src/couch_stats_collector.erl +++ b/src/couch_stats_collector.erl @@ -106,7 +106,7 @@ handle_cast({track_process_count, Pid, Stat}, State) -> handle_info({'DOWN', Ref, _, _, _}, State) -> Stat = dict:fetch(Ref, State), - ok = couch_stats_collector:decrement(Stat), + couch_stats_collector:decrement(Stat), {noreply, dict:erase(Ref, State)}. code_change(_OldVersion, State, _Extra) when is_list(State) ->