diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-11-05 14:55:54 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-11-05 14:55:54 +0000 |
| commit | 780c08a8557938b1395ef298552a542d5c685b6f (patch) | |
| tree | fcebdc02a1ac03235ced03cd7c5a55a112701d6c | |
| parent | 881de92e1a3eae96c5e12e3012e2119cea62b4cc (diff) | |
| download | rabbitmq-server-git-780c08a8557938b1395ef298552a542d5c685b6f.tar.gz | |
tweak
| -rw-r--r-- | src/rabbit_amqqueue.erl | 15 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 5e163800ba..922951be89 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -371,8 +371,8 @@ assert_args_equivalence(#amqqueue{name = QueueName, arguments = Args}, Args, RequiredArgs, QueueName, [<<"x-expires">>, <<"x-message-ttl">>]). check_declare_arguments(QueueName, Args) -> - Checks = [{<<"x-expires">>, fun check_positive_expires/2}, - {<<"x-message-ttl">>, fun check_non_neg_ttl/2}, + Checks = [{<<"x-expires">>, fun check_expires_arg/2}, + {<<"x-message-ttl">>, fun check_message_ttl_arg/2}, {<<"x-dead-letter-exchange">>, fun check_string_arg/2}, {<<"x-dead-letter-routing-key">>, fun check_dlxrk_arg/2}], [case rabbit_misc:table_lookup(Args, Key) of @@ -399,18 +399,17 @@ check_int_arg({Type, _}, _) -> false -> {error, {unacceptable_type, Type}} end. -check_positive_expires({Type, Val}, Args) -> +check_expires_arg({Type, Val}, Args) -> case check_int_arg({Type, Val}, Args) of - ok when Val == 0 -> {error, {value_zero_or_less, Val}}; + ok when Val == 0 -> {error, {value_zero, Val}}; ok -> rabbit_misc:check_expiry(Val); Error -> Error end. -check_non_neg_ttl({Type, Val}, Args) -> +check_message_ttl_arg({Type, Val}, Args) -> case check_int_arg({Type, Val}, Args) of - ok when Val >= 0 -> rabbit_misc:check_expiry(Val); - ok -> {error, {value_less_than_zero, Val}}; - Error -> Error + ok -> rabbit_misc:check_expiry(Val); + Error -> Error end. check_dlxrk_arg({longstr, _}, Args) -> diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 7ea345e1f2..bdc5285213 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -1008,7 +1008,7 @@ term_to_json(V) when is_binary(V) orelse is_number(V) orelse V =:= null orelse check_expiry(N) when N > ?MAX_EXPIRY_TIMER -> {error, {value_too_big, N}}; check_expiry(N) when N < 0 -> - {error, {negative_value, N}}; + {error, {value_negative, N}}; check_expiry(_N) -> ok. |