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 A0BB411B73 for ; Thu, 28 Aug 2014 12:12:03 +0000 (UTC) Received: (qmail 6450 invoked by uid 500); 28 Aug 2014 12:11:39 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 6163 invoked by uid 500); 28 Aug 2014 12:11:39 -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 4875 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 D2EA7A02C08; 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:12:23 -0000 Message-Id: <7f75f5fb507c4c5d9b3a391bddff4fd5@git.apache.org> In-Reply-To: <149709301f134b60b82ddbd5d3fa6544@git.apache.org> References: <149709301f134b60b82ddbd5d3fa6544@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [47/50] couch commit: updated refs/heads/master to 9d0ac7d Verify that remaining monitor is actually the process tracker Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/ac3f1c25 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/ac3f1c25 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/ac3f1c25 Branch: refs/heads/master Commit: ac3f1c25f6f13cca31fd54d9e3c1fbf0ac26639a Parents: 3ab1e24 Author: Robert Newson Authored: Tue Aug 26 11:23:34 2014 +0100 Committer: Robert Newson Committed: Thu Aug 28 13:00:03 2014 +0100 ---------------------------------------------------------------------- src/couch_file.erl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/ac3f1c25/src/couch_file.erl ---------------------------------------------------------------------- diff --git a/src/couch_file.erl b/src/couch_file.erl index be6b634..09b8e3c 100644 --- a/src/couch_file.erl +++ b/src/couch_file.erl @@ -581,8 +581,9 @@ is_idle(#file{is_sys=true}) -> _ -> false end; is_idle(#file{is_sys=false}) -> + Tracker = whereis(couch_stats_process_tracker), case process_info(self(), monitored_by) of {monitored_by, []} -> true; - {monitored_by, [_]} -> true; + {monitored_by, [Tracker]} -> true; _ -> false end.