summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2010-08-05 17:56:09 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2010-08-05 17:56:09 +0100
commit2420864dbc7affa077c4cdd031482eebd403999e (patch)
tree634c326cb1de64ea50edd1fc2fe4f8bf1917399f /src
parentfbdc8c26f8915d72548415e2ff20fe546968b2b8 (diff)
downloadrabbitmq-server-git-2420864dbc7affa077c4cdd031482eebd403999e.tar.gz
nicer error messages
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_amqqueue.erl5
-rw-r--r--src/rabbit_misc.erl4
2 files changed, 4 insertions, 5 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index b55d5b210c..2453280e34 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -305,9 +305,8 @@ check_declare_arguments(QueueName, Args) ->
ok -> ok;
{error, Error} -> rabbit_misc:protocol_error(
precondition_failed,
- "Invalid arguments in declaration of queue ~s: "
- "~w (on argument: ~w)",
- [rabbit_misc:rs(QueueName), Error, Key])
+ "invalid arg '~s' for ~s: ~w",
+ [Key, rabbit_misc:rs(QueueName), Error])
end || {Key, Fun} <- [{<<"x-expires">>, fun check_expires_argument/1}]],
ok.
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index 638596b724..5fa3f8edb4 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -235,9 +235,9 @@ assert_args_equivalence1(Orig, New, Name, Key) ->
{Same, Same} -> ok;
{Orig1, New1} -> protocol_error(
not_allowed,
- "cannot redeclare ~s with inequivalent args for ~s: "
+ "inequivalent arg '~s' for ~s: "
"required ~w, received ~w",
- [rabbit_misc:rs(Name), Key, New1, Orig1])
+ [Key, rabbit_misc:rs(Name), New1, Orig1])
end.
get_config(Key) ->