diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index df18279614..2b99f71244 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_int_arg/2}, - {<<"x-message-ttl">>, fun check_non_neg_int_arg/2}, + Checks = [{<<"x-expires">>, fun check_positive_expires/2}, + {<<"x-message-ttl">>, fun check_non_neg_ttl/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,14 +399,14 @@ check_int_arg({Type, _}, _) -> false -> {error, {unacceptable_type, Type}} end. -check_positive_int_arg({Type, Val}, Args) -> +check_positive_expires({Type, Val}, Args) -> case check_int_arg({Type, Val}, Args) of ok when Val > 0 -> rabbit_misc:check_expiry_size(Val); ok -> {error, {value_zero_or_less, Val}}; Error -> Error end. -check_non_neg_int_arg({Type, Val}, Args) -> +check_non_neg_ttl({Type, Val}, Args) -> case check_int_arg({Type, Val}, Args) of ok when Val >= 0 -> rabbit_misc:check_expiry_size(Val); ok -> {error, {value_less_than_zero, Val}}; |