diff options
| -rw-r--r-- | src/rabbit_amqqueue.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index dacf4f0ad2..9d6dcd157b 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -390,7 +390,7 @@ check_declare_arguments(QueueName, Args) -> {<<"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}, - {<<"x-maxdepth">>, fun check_maxdepth_arg/2}], + {<<"x-max-length">>, fun check_max_length_arg/2}], [case rabbit_misc:table_lookup(Args, Key) of undefined -> ok; TypeVal -> case Fun(TypeVal, Args) of @@ -413,7 +413,7 @@ check_int_arg({Type, _}, _) -> false -> {error, {unacceptable_type, Type}} end. -check_maxdepth_arg({Type, Val}, Args) -> +check_max_length_arg({Type, Val}, Args) -> case check_int_arg({Type, Val}, Args) of ok when Val > 0 -> ok; ok -> {error, {value_not_positive, Val}}; diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 09f0110916..6eb408864e 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -55,7 +55,7 @@ queue_monitors, dlx, dlx_routing_key, - max_depth + max_length }). -record(consumer, {tag, ack_required}). @@ -135,7 +135,7 @@ init(Q) -> senders = pmon:new(), dlx = undefined, dlx_routing_key = undefined, - max_depth = undefined, + max_length = undefined, publish_seqno = 1, unconfirmed = dtree:empty(), delayed_stop = undefined, @@ -161,7 +161,7 @@ init_with_backing_queue_state(Q = #amqqueue{exclusive_owner = Owner}, BQ, BQS, rate_timer_ref = RateTRef, expiry_timer_ref = undefined, ttl = undefined, - max_depth = undefined, + max_length = undefined, senders = Senders, publish_seqno = 1, unconfirmed = dtree:empty(), @@ -262,7 +262,7 @@ process_args(State = #q{q = #amqqueue{arguments = Arguments}}) -> {<<"x-dead-letter-exchange">>, fun init_dlx/2}, {<<"x-dead-letter-routing-key">>, fun init_dlx_routing_key/2}, {<<"x-message-ttl">>, fun init_ttl/2}, - {<<"x-maxdepth">>, fun init_maxdepth/2}]). + {<<"x-max-length">>, fun init_max_length/2}]). init_expires(Expires, State) -> ensure_expiry_timer(State#q{expires = Expires}). @@ -274,8 +274,8 @@ init_dlx(DLX, State = #q{q = #amqqueue{name = QName}}) -> init_dlx_routing_key(RoutingKey, State) -> State#q{dlx_routing_key = RoutingKey}. -init_maxdepth(MaxDepth, State) -> - State#q{max_depth = MaxDepth}. +init_max_length(MaxLen, State) -> + State#q{max_length = MaxLen}. terminate_shutdown(Fun, State) -> State1 = #q{backing_queue_state = BQS} = @@ -582,23 +582,23 @@ publish_max(#delivery{message = Message, sender = SenderPid}, Props, Delivered, #q{backing_queue = BQ, backing_queue_state = BQS, - max_depth = undefined}) -> + max_length = undefined}) -> BQ:publish(Message, Props, Delivered, SenderPid, BQS); publish_max(#delivery{message = Message, msg_seq_no = MsgSeqNo, sender = SenderPid}, Props, Delivered, #q{backing_queue = BQ, backing_queue_state = BQS, - max_depth = MaxDepth}) -> - case {BQ:depth(BQS) >= MaxDepth, BQ:len(BQS) =:= 0} of + max_length = MaxLen}) -> + case {BQ:depth(BQS) >= MaxLen, BQ:len(BQS) =:= 0} of {false, _} -> BQ:publish(Message, Props, Delivered, SenderPid, BQS); {true, true} -> - (dead_letter_fun(maxdepth))([{Message, undefined}]), + (dead_letter_fun(maxlen))([{Message, undefined}]), nopub; {true, false} -> {{Msg, _IsDelivered, AckTag}, BQS1} = BQ:fetch(true, BQS), - (dead_letter_fun(maxdepth))([{Msg, AckTag}]), + (dead_letter_fun(maxlen))([{Msg, AckTag}]), BQ:publish(Message, Props, Delivered, SenderPid, BQS1) end. |