diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-19 16:17:36 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-19 16:17:36 +0100 |
| commit | 911d0d53574addcd92bf013b67d962da0baded39 (patch) | |
| tree | 5119c621e0726d6a9f959a0b3aa5b7df456c92bf | |
| parent | 3395a5842b58828f8fc77a95cd32656ceaea5af1 (diff) | |
| download | rabbitmq-server-git-911d0d53574addcd92bf013b67d962da0baded39.tar.gz | |
only output warning if clustered
| -rw-r--r-- | src/rabbit_mnesia.erl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index c63c67f4ea..1ea909714e 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -122,8 +122,10 @@ cluster(ClusterNodes, Force) -> ensure_mnesia_not_running(), ensure_mnesia_dir(), - case not Force andalso is_only_disc_node(node(), false) andalso - not should_be_disc_node(ClusterNodes) of + case not Force andalso is_clustered() andalso + is_only_disc_node(node(), false) andalso + not should_be_disc_node(ClusterNodes) + of true -> log_both("last running disc node leaving cluster"); _ -> ok end, @@ -715,7 +717,9 @@ wait_for_tables(TableNames) -> reset(Force) -> ensure_mnesia_not_running(), - case not Force andalso is_only_disc_node(node(), false) of + case not Force andalso is_clustered() andalso + is_only_disc_node(node(), false) + of true -> log_both("no other disc nodes running"); false -> ok end, |