diff options
| author | Rob Harrop <rob@rabbitmq.com> | 2011-08-24 08:52:14 +0100 |
|---|---|---|
| committer | Rob Harrop <rob@rabbitmq.com> | 2011-08-24 08:52:14 +0100 |
| commit | bb7006f50c9bee6231824c828af32f893e06d039 (patch) | |
| tree | 360f2e73e2ccf1f20fe517aef2da3c0c880ecb2c | |
| parent | 0d9491a0c63c49aa1ed5f8943689ce738a7cb07d (diff) | |
| parent | 4121d7dd450125edfd7720d4ee6f9cbdfa00492b (diff) | |
| download | rabbitmq-server-bb7006f50c9bee6231824c828af32f893e06d039.tar.gz | |
Merge bug24095 into default
| -rw-r--r-- | src/rabbit_amqqueue.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_mnesia.erl | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 88ff26cc..5bd42d9a 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -320,7 +320,7 @@ check_declare_arguments(QueueName, Args) -> ok -> ok; {error, Error} -> rabbit_misc:protocol_error( precondition_failed, - "invalid arg '~s' for ~s: ~w", + "invalid arg '~s' for ~s: ~255p", [Key, rabbit_misc:rs(QueueName), Error]) end || {Key, Fun} <- [{<<"x-expires">>, fun check_integer_argument/2}, diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index c63c67f4..1ea90971 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, |