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 0E62E18A79 for ; Wed, 2 Mar 2016 20:36:30 +0000 (UTC) Received: (qmail 79855 invoked by uid 500); 2 Mar 2016 20:36:29 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 79801 invoked by uid 500); 2 Mar 2016 20:36:29 -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 79785 invoked by uid 99); 2 Mar 2016 20:36:29 -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; Wed, 02 Mar 2016 20:36:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9ADD0E0667; Wed, 2 Mar 2016 20:36:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: iilyak@apache.org To: commits@couchdb.apache.org Date: Wed, 02 Mar 2016 20:36:29 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] couch-replicator commit: updated refs/heads/master to da86098 Repository: couchdb-couch-replicator Updated Branches: refs/heads/master fc49a366c -> da860981c Remove configurable replicator db name JIRA: COUCHDB-2954 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/e1fa3c3f Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/e1fa3c3f Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/e1fa3c3f Branch: refs/heads/master Commit: e1fa3c3fa197ef1bf5a188e567a4f5996e56b30d Parents: fc49a36 Author: Nick Vatamaniuc Authored: Fri Feb 26 16:10:27 2016 -0500 Committer: Nick Vatamaniuc Committed: Wed Mar 2 10:26:13 2016 -0500 ---------------------------------------------------------------------- src/couch_replicator_manager.erl | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/e1fa3c3f/src/couch_replicator_manager.erl ---------------------------------------------------------------------- diff --git a/src/couch_replicator_manager.erl b/src/couch_replicator_manager.erl index f0ac7a8..30e1112 100644 --- a/src/couch_replicator_manager.erl +++ b/src/couch_replicator_manager.erl @@ -137,9 +137,6 @@ continue(#rep{id = RepId}) -> {node() == Owner, Owner}. -handle_config_change("replicator", "db", _, _, S) -> - ok = gen_server:call(S, rep_db_changed), - remove_handler; handle_config_change("replicator", "max_replication_retry_count", V, _, S) -> ok = gen_server:cast(S, {set_max_retries, retries_value(V)}), {ok, S}; @@ -164,9 +161,8 @@ init(_) -> ok = config:listen_for_changes(?MODULE, Server), ScanPid = spawn_link(fun() -> scan_all_dbs(Server) end), % Automatically start node local changes feed loop - LocalRepDb = ?l2b(config:get("replicator", "db", "_replicator")), - ensure_rep_db_exists(LocalRepDb), - Pid = start_changes_reader(LocalRepDb, 0), + ensure_rep_db_exists(<<"_replicator">>), + Pid = start_changes_reader(<<"_replicator">>, 0), {ok, #state{ event_listener = start_event_listener(), scan_pid = ScanPid, @@ -229,9 +225,6 @@ handle_call({rep_db_checkpoint, DbName, EndSeq}, _From, State) -> true = ets:insert(?DB_TO_SEQ, Entry), {reply, ok, State}; -handle_call(rep_db_changed, _From, State) -> - {stop, shutdown, ok, State}; - handle_call(Msg, From, State) -> couch_log:error("Replication manager received unexpected call ~p from ~p", [Msg, From]),