diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 16 | ||||
| -rw-r--r-- | src/rabbit_policies.erl | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 592de77c97..ce73460603 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -625,7 +625,7 @@ check_dlxrk_arg({Type, _}, _Args) -> {error, {unacceptable_type, Type}}. check_overflow({longstr, Val}, _Args) -> - case lists:member(Val, [<<"drop_head">>, <<"reject_publish">>]) of + case lists:member(Val, [<<"drop-head">>, <<"reject-publish">>]) of true -> ok; false -> {error, invalid_overflow} end; diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 3cd9f4195d..7721fc70fc 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -80,7 +80,7 @@ %% max length in bytes, if configured max_bytes, %% an action to perform if queue is to be over a limit, - %% can be either drop_head (default) or reject_publish + %% can be either drop-head (default) or reject-publish overflow, %% when policies change, this version helps queue %% determine what previously scheduled/set up state to ignore, @@ -162,7 +162,7 @@ init_state(Q) -> msg_id_to_channel = gb_trees:empty(), status = running, args_policy_version = 0, - overflow = drop_head}, + overflow = 'drop-head'}, rabbit_event:init_stats_timer(State, #q.stats_timer). init_it(Recover, From, State = #q{q = #amqqueue{exclusive_owner = none}}) -> @@ -634,9 +634,9 @@ attempt_delivery(Delivery = #delivery{sender = SenderPid, maybe_deliver_or_enqueue(Delivery, Delivered, State = #q{overflow = Overflow}) -> send_mandatory(Delivery), %% must do this before confirms case {will_overflow(Delivery, State), Overflow} of - {true, reject_publish} -> + {true, 'reject-publish'} -> %% Drop publish and nack to publisher - nack_publish_no_space(Delivery, Delivered, State); + send_reject_publish(Delivery, Delivered, State); _ -> %% Enqueue and maybe drop head later deliver_or_enqueue(Delivery, Delivered, State) @@ -686,9 +686,9 @@ deliver_or_enqueue(Delivery = #delivery{message = Message, maybe_drop_head(State = #q{max_length = undefined, max_bytes = undefined}) -> {false, State}; -maybe_drop_head(State = #q{overflow = reject_publish}) -> +maybe_drop_head(State = #q{overflow = 'reject-publish'}) -> {false, State}; -maybe_drop_head(State = #q{overflow = drop_head}) -> +maybe_drop_head(State = #q{overflow = 'drop-head'}) -> maybe_drop_head(false, State). maybe_drop_head(AlreadyDropped, State = #q{backing_queue = BQ, @@ -707,7 +707,7 @@ maybe_drop_head(AlreadyDropped, State = #q{backing_queue = BQ, {AlreadyDropped, State} end. -nack_publish_no_space(#delivery{confirm = true, +send_reject_publish(#delivery{confirm = true, sender = SenderPid, msg_seq_no = MsgSeqNo} = Delivery, _Delivered, @@ -717,7 +717,7 @@ nack_publish_no_space(#delivery{confirm = true, {BQS1, MTC1} = discard(Delivery, BQ, BQS, MTC), gen_server2:cast(SenderPid, {reject_publish, MsgSeqNo, self()}), State#q{ backing_queue_state = BQS1, msg_id_to_channel = MTC1 }; -nack_publish_no_space(#delivery{confirm = false}, +send_reject_publish(#delivery{confirm = false}, _Delivered, State) -> State. diff --git a/src/rabbit_policies.erl b/src/rabbit_policies.erl index 3fadfc82e1..f48189b210 100644 --- a/src/rabbit_policies.erl +++ b/src/rabbit_policies.erl @@ -106,9 +106,9 @@ validate_policy0(<<"queue-mode">>, <<"lazy">>) -> ok; validate_policy0(<<"queue-mode">>, Value) -> {error, "~p is not a valid queue-mode value", [Value]}; -validate_policy0(<<"overflow">>, <<"drop_head">>) -> +validate_policy0(<<"overflow">>, <<"drop-head">>) -> ok; -validate_policy0(<<"overflow">>, <<"reject_publish">>) -> +validate_policy0(<<"overflow">>, <<"reject-publish">>) -> ok; validate_policy0(<<"overflow">>, Value) -> {error, "~p is not a valid overflow value", [Value]}. |