diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-04 17:14:56 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-04 17:14:56 +0100 |
| commit | 20f581d196216fc48f84c884d4fa9bd77adf9aac (patch) | |
| tree | 02458dab96cc407b730410dd00966d1430e79499 | |
| parent | 33f2427221c393d90fb66a6a1208905874ca97de (diff) | |
| download | rabbitmq-server-git-20f581d196216fc48f84c884d4fa9bd77adf9aac.tar.gz | |
don't warn if Force is set
Because the warnings require mnesia to be started and Force is usually
used when mnesia cannot be started (e.g. when force_resetting the last
node in a cluster).
| -rw-r--r-- | src/rabbit_mnesia.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 4b83351531..6edc5d58a3 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -118,7 +118,7 @@ cluster(ClusterNodes, Force) -> ensure_mnesia_not_running(), ensure_mnesia_dir(), - case {is_only_disc_node(node(), false), + case {not Force andalso is_only_disc_node(node(), false), should_be_disc_node(ClusterNodes)} of {true, false} -> log_both("last disc node leaving cluster"); _ -> ok @@ -697,7 +697,7 @@ wait_for_tables(TableNames) -> reset(Force) -> ensure_mnesia_not_running(), - case is_only_disc_node(node(), false) of + case not Force andalso is_only_disc_node(node(), false) of true -> log_both("resetting only disc node"); false -> ok end, |