summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipe David Borba Manana <fdmanana@apache.org>2011-07-02 18:47:54 +0000
committerRobert Newson <robert.newson@cloudant.com>2011-07-05 12:38:10 +0100
commit571d63d20b8f20dc662d755248c9fafe47811782 (patch)
tree4d494358d062f01db8c90b96cdc6ac1d13f300da
parent82fe0bb6384d7b9a6528e02aa4597a3c1431419a (diff)
Merge revision 1142259 from trunk
Replication manager, ignore db monitor messages Ignore local database monitor messages. These messages are received in some circunstances because replication processes spawn local database monitors but never do the corresponding erlang:demonitor/1,2 calls. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1142260 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--apps/couch/src/couch_replication_manager.erl4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/couch/src/couch_replication_manager.erl b/apps/couch/src/couch_replication_manager.erl
index 7e2c8118..943cafa8 100644
--- a/apps/couch/src/couch_replication_manager.erl
+++ b/apps/couch/src/couch_replication_manager.erl
@@ -190,6 +190,10 @@ handle_info({'EXIT', From, normal}, #state{rep_start_pids = Pids} = State) ->
% one of the replication start processes terminated successfully
{noreply, State#state{rep_start_pids = Pids -- [From]}};
+handle_info({'DOWN', _Ref, _, _, _}, State) ->
+ % From a db monitor created by a replication process. Ignore.
+ {noreply, State};
+
handle_info(Msg, State) ->
?LOG_ERROR("Replication manager received unexpected message ~p", [Msg]),
{stop, {unexpected_msg, Msg}, State}.