diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2020-03-31 18:49:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-31 18:49:45 +0300 |
| commit | 0c48e47b6b7e771b96fb2dfdaa0b224119dde75b (patch) | |
| tree | e3860d9faa3bb4c9f128f1df1c2d3af3193c9358 | |
| parent | f80500bd6b5e437683c8bbe2f702d4add2acc96c (diff) | |
| parent | 6081958a0f6e589963d2fa7d617f39c1354c9e58 (diff) | |
| download | rabbitmq-server-git-0c48e47b6b7e771b96fb2dfdaa0b224119dde75b.tar.gz | |
Merge pull request #2293 from rabbitmq/fix-rabbit-channel-record
Move rabbit_channel config value to config record
| -rw-r--r-- | src/rabbit_channel.erl | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 5aa39c9792..bc32359769 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -122,7 +122,9 @@ %% Message content size limit max_message_size, consumer_timeout, - authz_context + authz_context, + %% defines how ofter gc will be executed + writer_gc_threshold }). -record(ch, {cfg :: #conf{}, @@ -169,9 +171,7 @@ delivery_flow, interceptor_state, queue_states, - tick_timer, - %% defines how ofter gc will be executed - writer_gc_threshold + tick_timer }). -define(QUEUE, lqueue). @@ -527,7 +527,8 @@ init([Channel, ReaderPid, WriterPid, ConnPid, ConnName, Protocol, User, VHost, consumer_prefetch = Prefetch, max_message_size = MaxMessageSize, consumer_timeout = ConsumerTimeout, - authz_context = OptionalVariables + authz_context = OptionalVariables, + writer_gc_threshold = GCThreshold }, limiter = Limiter, tx = none, @@ -546,8 +547,7 @@ init([Channel, ReaderPid, WriterPid, ConnPid, ConnName, Protocol, User, VHost, reply_consumer = none, delivery_flow = Flow, interceptor_state = undefined, - queue_states = #{}, - writer_gc_threshold = GCThreshold + queue_states = #{} }, State1 = State#ch{ interceptor_state = rabbit_channel_interceptor:init(State)}, @@ -1309,12 +1309,12 @@ handle_method(#'basic.publish'{exchange = ExchangeNameBin, user = #user{username = Username} = User, trace_state = TraceState, max_message_size = MaxMessageSize, - authz_context = AuthzContext + authz_context = AuthzContext, + writer_gc_threshold = GCThreshold }, tx = Tx, confirm_enabled = ConfirmEnabled, - delivery_flow = Flow, - writer_gc_threshold = GCThreshold + delivery_flow = Flow }) -> check_msg_size(Content, MaxMessageSize, GCThreshold), ExchangeName = rabbit_misc:r(VHostPath, exchange, ExchangeNameBin), @@ -2693,9 +2693,9 @@ handle_deliver(ConsumerTag, AckRequired, #basic_message{exchange_name = ExchangeName, routing_keys = [RoutingKey | _CcRoutes], content = Content}}, - State = #ch{cfg = #conf{writer_pid = WriterPid}, - next_tag = DeliveryTag, - writer_gc_threshold = GCThreshold}) -> + State = #ch{cfg = #conf{writer_pid = WriterPid, + writer_gc_threshold = GCThreshold}, + next_tag = DeliveryTag}) -> Deliver = #'basic.deliver'{consumer_tag = ConsumerTag, delivery_tag = DeliveryTag, redelivered = Redelivered, |