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 1A6D9200B4F for ; Tue, 26 Jul 2016 22:00:27 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 19162160AA5; Tue, 26 Jul 2016 20:00:27 +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 6B253160AA2 for ; Tue, 26 Jul 2016 22:00:26 +0200 (CEST) Received: (qmail 94574 invoked by uid 500); 26 Jul 2016 20:00:25 -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 94560 invoked by uid 99); 26 Jul 2016 20:00:25 -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; Tue, 26 Jul 2016 20:00:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7D223E08E8; Tue, 26 Jul 2016 20:00:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vatamane@apache.org To: commits@couchdb.apache.org Date: Tue, 26 Jul 2016 20:00:25 -0000 Message-Id: <3f90ebb13327493b93b264c3a7e52079@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] couch-replicator commit: updated refs/heads/3082-replication-manager-rep_start_pids-fix to 05247a2 [Forced Update!] archived-at: Tue, 26 Jul 2016 20:00:27 -0000 Repository: couchdb-couch-replicator Updated Branches: refs/heads/3082-replication-manager-rep_start_pids-fix 3d7445c01 -> 05247a260 (forced update) Replace hard-coded instances of <<"_replicator">> dbs with a macro There are 3 of those. For now replace only those which refer to db names, not role. Jira: COUCHDB-3082 Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/commit/c661e74d Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/c661e74d Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/c661e74d Branch: refs/heads/3082-replication-manager-rep_start_pids-fix Commit: c661e74d2de99007804b6cb60489421d68fe406f Parents: bf636d3 Author: Nick Vatamaniuc Authored: Tue Jul 26 15:22:52 2016 -0400 Committer: Nick Vatamaniuc Committed: Tue Jul 26 16:00:04 2016 -0400 ---------------------------------------------------------------------- src/couch_replicator_manager.erl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/c661e74d/src/couch_replicator_manager.erl ---------------------------------------------------------------------- diff --git a/src/couch_replicator_manager.erl b/src/couch_replicator_manager.erl index 21d732f..dca1154 100644 --- a/src/couch_replicator_manager.erl +++ b/src/couch_replicator_manager.erl @@ -48,6 +48,7 @@ -define(AVG_ERROR_DELAY_MSEC, 100). -define(MAX_ERROR_DELAY_MSEC, 60000). -define(OWNER, <<"owner">>). +-define(REPLICATOR_DB, <<"_replicator">>). -define(DB_TO_SEQ, db_to_seq). -define(CTX, {user_ctx, #user_ctx{roles=[<<"_admin">>, <<"_replicator">>]}}). @@ -175,8 +176,8 @@ init(_) -> Epoch = make_ref(), ScanPid = spawn_link(fun() -> scan_all_dbs(Server) end), % Automatically start node local changes feed loop - ensure_rep_db_exists(<<"_replicator">>), - Pid = start_changes_reader(<<"_replicator">>, 0, Epoch), + ensure_rep_db_exists(?REPLICATOR_DB), + Pid = start_changes_reader(?REPLICATOR_DB, 0, Epoch), {ok, #state{ event_listener = start_event_listener(), scan_pid = ScanPid, @@ -951,7 +952,7 @@ scan_all_dbs(Server) when is_pid(Server) -> end, ok). is_replicator_db(DbName) -> - <<"_replicator">> =:= couch_db:dbname_suffix(DbName). + ?REPLICATOR_DB =:= couch_db:dbname_suffix(DbName). get_json_value(Key, Props) -> get_json_value(Key, Props, undefined).