diff options
| -rw-r--r-- | src/rabbit_mnesia.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_node_monitor.erl | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 6edc5d58a3..2f18682c0b 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -118,8 +118,8 @@ cluster(ClusterNodes, Force) -> ensure_mnesia_not_running(), ensure_mnesia_dir(), - case {not Force andalso is_only_disc_node(node(), false), - should_be_disc_node(ClusterNodes)} of + case not Force andalso is_only_disc_node(node(), false) and + not should_be_disc_node(ClusterNodes) of {true, false} -> log_both("last disc node leaving cluster"); _ -> ok end, diff --git a/src/rabbit_node_monitor.erl b/src/rabbit_node_monitor.erl index 96a68b721f..833e192386 100644 --- a/src/rabbit_node_monitor.erl +++ b/src/rabbit_node_monitor.erl @@ -90,9 +90,7 @@ code_change(_OldVsn, State, _Extra) -> %% TODO: This may turn out to be a performance hog when there are lots %% of nodes. We really only need to execute some of these statements -%% on *one* node, rather than all of them. NOTE: This function will be -%% executed *twice* if the other rabbit node is shut down cleanly -%% (once for the rabbit_app going down and once for the node). +%% on *one* node, rather than all of them. handle_dead_rabbit(Node) -> ok = rabbit_networking:on_node_down(Node), ok = rabbit_amqqueue:on_node_down(Node), |