diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2010-08-05 18:03:51 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2010-08-05 18:03:51 +0100 |
| commit | 4cf6acfe5b5c4a6270fbaf7d295929819b178eaa (patch) | |
| tree | 5a8f40ec4068adf9dbb112a9a856de76c9869c79 | |
| parent | dad95a37b5d11f38079e9d05e8002fd513a29af4 (diff) | |
| parent | a5cc071bfda2d542a096763a25cef4174301dfe1 (diff) | |
| download | rabbitmq-server-4cf6acfe5b5c4a6270fbaf7d295929819b178eaa.tar.gz | |
Merging bug 23027 onto default
| -rw-r--r-- | src/rabbit_amqqueue.erl | 5 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index b55d5b21..2453280e 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 638596b7..5fa3f8ed 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) -> |