From commits-return-7007-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org Wed Oct 5 00:13:20 2011 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 CDE2F7E52 for ; Wed, 5 Oct 2011 00:13:20 +0000 (UTC) Received: (qmail 60764 invoked by uid 500); 5 Oct 2011 00:13:20 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 60728 invoked by uid 500); 5 Oct 2011 00:13:20 -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 60721 invoked by uid 99); 5 Oct 2011 00:13:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Oct 2011 00:13:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Oct 2011 00:13:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D6B9054CCA; Wed, 5 Oct 2011 00:12:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: fdmanana@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: Open replicator database in child process Message-Id: <20111005001258.D6B9054CCA@tyr.zones.apache.org> Date: Wed, 5 Oct 2011 00:12:58 +0000 (UTC) Updated Branches: refs/heads/master 3c24a94dd -> 0c7fbd3da Open replicator database in child process This is more correct and less confusing. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/0c7fbd3d Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/0c7fbd3d Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/0c7fbd3d Branch: refs/heads/master Commit: 0c7fbd3dab5bf13215def4349dbba7f689a22ac6 Parents: 3c24a94 Author: Filipe David Manana Authored: Wed Oct 5 01:10:54 2011 +0100 Committer: Filipe David Manana Committed: Wed Oct 5 01:12:45 2011 +0100 ---------------------------------------------------------------------- src/couchdb/couch_replication_manager.erl | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/0c7fbd3d/src/couchdb/couch_replication_manager.erl ---------------------------------------------------------------------- diff --git a/src/couchdb/couch_replication_manager.erl b/src/couchdb/couch_replication_manager.erl index 5885732..7d1860e 100644 --- a/src/couchdb/couch_replication_manager.erl +++ b/src/couchdb/couch_replication_manager.erl @@ -223,9 +223,12 @@ code_change(_OldVsn, State, _Extra) -> changes_feed_loop() -> {ok, RepDb} = ensure_rep_db_exists(), + RepDbName = couch_db:name(RepDb), + couch_db:close(RepDb), Server = self(), Pid = spawn_link( fun() -> + {ok, Db} = couch_db:open_int(RepDbName, [sys_db]), ChangesFeedFun = couch_changes:handle_changes( #changes_args{ include_docs = true, @@ -234,7 +237,7 @@ changes_feed_loop() -> db_open_options = [sys_db] }, {json_req, null}, - RepDb + Db ), ChangesFeedFun( fun({change, Change, _}, _) -> @@ -248,11 +251,11 @@ changes_feed_loop() -> (_, _) -> ok end - ) + ), + couch_db:close(Db) end ), - couch_db:close(RepDb), - {Pid, couch_db:name(RepDb)}. + {Pid, RepDbName}. has_valid_rep_id({Change}) ->