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 D572F17908 for ; Wed, 4 Feb 2015 15:49:38 +0000 (UTC) Received: (qmail 77205 invoked by uid 500); 4 Feb 2015 15:49:39 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 77099 invoked by uid 500); 4 Feb 2015 15:49: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 76989 invoked by uid 99); 4 Feb 2015 15:49:39 -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, 04 Feb 2015 15:49:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 93FEBE04D1; Wed, 4 Feb 2015 15:49:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kxepal@apache.org To: commits@couchdb.apache.org Date: Wed, 04 Feb 2015 15:49:41 -0000 Message-Id: <920c2e2603d7439fa285215d3f412b83@git.apache.org> In-Reply-To: <522a27744b5945babe14e806bab8647c@git.apache.org> References: <522a27744b5945babe14e806bab8647c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] couch-replicator commit: updated refs/heads/master to b1c2cc0 Update config_listener behaviuor COUCHDB-2561 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/5007234f Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/5007234f Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/5007234f Branch: refs/heads/master Commit: 5007234f9ecb0ce0d5b9a13d4fdf0213a9909760 Parents: 4de038d Author: ILYA Khlopotov Authored: Thu Jan 29 13:45:20 2015 -0800 Committer: ILYA Khlopotov Committed: Wed Feb 4 06:09:50 2015 -0800 ---------------------------------------------------------------------- src/couch_replicator_manager.erl | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/5007234f/src/couch_replicator_manager.erl ---------------------------------------------------------------------- diff --git a/src/couch_replicator_manager.erl b/src/couch_replicator_manager.erl index d6c88c1..15b5b57 100644 --- a/src/couch_replicator_manager.erl +++ b/src/couch_replicator_manager.erl @@ -12,7 +12,7 @@ -module(couch_replicator_manager). -behaviour(gen_server). --vsn(1). +-vsn(2). -behaviour(config_listener). % public API @@ -28,7 +28,7 @@ -export([changes_reader/3, changes_reader_cb/3]). % config_listener callback --export([handle_config_change/5]). +-export([handle_config_change/5, handle_config_terminate/3]). -export([handle_db_event/3]). @@ -125,6 +125,11 @@ handle_config_change("replicator", "max_replication_retry_count", V, _, S) -> handle_config_change(_, _, _, _, S) -> {ok, S}. +handle_config_terminate(Self, _, _) -> + spawn(fun() -> + timer:sleep(5000), + config:listen_for_changes(?MODULE, Self) + end). init(_) -> process_flag(trap_exit, true), @@ -250,14 +255,6 @@ handle_info({'DOWN', _Ref, _, _, _}, State) -> % From a db monitor created by a replication process. Ignore. {noreply, State}; -handle_info({gen_event_EXIT, {config_listener, ?MODULE}, _Reason}, State) -> - erlang:send_after(5000, self(), restart_config_listener), - {noreply, State}; - -handle_info(restart_config_listener, State) -> - ok = config:listen_for_changes(?MODULE, self()), - {noreply, State}; - handle_info(shutdown, State) -> {stop, shutdown, State};