diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-03-12 16:57:29 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-03-12 16:57:29 +0000 |
| commit | 62d12b03e9abe95c60bb00e7faafb6849dc21f9f (patch) | |
| tree | d7b9f422a5bd525b1ad2a54010c7651a7da03a7d | |
| parent | f6b576d9489b3e00235cf243fc87be63f02cce03 (diff) | |
| download | rabbitmq-server-62d12b03e9abe95c60bb00e7faafb6849dc21f9f.tar.gz | |
Oops. This was part of an (early, wrong) attempt at bug 25474 which got committed as part of f1317bb80df9 (bug 25358) by mistake. Remove.
| -rw-r--r-- | src/rabbit_node_monitor.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/rabbit_node_monitor.erl b/src/rabbit_node_monitor.erl index 47c753e3..98e26a6a 100644 --- a/src/rabbit_node_monitor.erl +++ b/src/rabbit_node_monitor.erl @@ -208,10 +208,9 @@ handle_call(_Request, _From, State) -> %% mnesia information since the message can (and will) overtake the %% mnesia propagation. handle_cast({node_up, Node, NodeType}, - State = #state{monitors = Monitors, partitions = Partitions}) -> - State1 = State#state{partitions = Partitions -- [Node]}, + State = #state{monitors = Monitors}) -> case pmon:is_monitored({rabbit, Node}, Monitors) of - true -> {noreply, State1}; + true -> {noreply, State}; false -> rabbit_log:info("rabbit on node ~p up~n", [Node]), {AllNodes, DiscNodes, RunningNodes} = read_cluster_status(), write_cluster_status({add_node(Node, AllNodes), @@ -221,7 +220,7 @@ handle_cast({node_up, Node, NodeType}, end, add_node(Node, RunningNodes)}), ok = handle_live_rabbit(Node), - {noreply, State1#state{ + {noreply, State#state{ monitors = pmon:monitor({rabbit, Node}, Monitors)}} end; handle_cast({joined_cluster, Node, NodeType}, State) -> |