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 A1A2811ABF for ; Tue, 26 Aug 2014 10:27:03 +0000 (UTC) Received: (qmail 74279 invoked by uid 500); 26 Aug 2014 10:27:03 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 74226 invoked by uid 500); 26 Aug 2014 10:27:03 -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 74217 invoked by uid 99); 26 Aug 2014 10:27:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Aug 2014 10:27:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3639DA04E36; Tue, 26 Aug 2014 10:27:03 +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 Message-Id: <5ffa91611715428082368ae2815dc825@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: couch commit: updated refs/heads/windsor-merge to 5899cd4 Date: Tue, 26 Aug 2014 10:27:03 +0000 (UTC) Repository: couchdb-couch Updated Branches: refs/heads/windsor-merge 14dc5e93d -> 5899cd4f5 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/5899cd4f Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/5899cd4f Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/5899cd4f Branch: refs/heads/windsor-merge Commit: 5899cd4f5c1543935d23e6bf87581d16fd75d56e Parents: 14dc5e9 Author: Robert Newson Authored: Tue Aug 26 11:23:34 2014 +0100 Committer: Robert Newson Committed: Tue Aug 26 11:23:34 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/5899cd4f/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.