diff options
| author | Marek Majkowski <marek@rabbitmq.com> | 2010-12-08 13:27:17 +0000 |
|---|---|---|
| committer | Marek Majkowski <marek@rabbitmq.com> | 2010-12-08 13:27:17 +0000 |
| commit | a782032665224f63bbc64ceb155cd6cc5fe2a759 (patch) | |
| tree | 8d4088c5198ed60e8a10f262a224dbe7cba1279e | |
| parent | 130f0c264e7618de6cd2853c7fca6510d319e0ac (diff) | |
| download | rabbitmq-server-a782032665224f63bbc64ceb155cd6cc5fe2a759.tar.gz | |
cosmetic: get rid of channel:internal_deliver
| -rw-r--r-- | src/rabbit_channel.erl | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 27dbe611..36db5a94 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -266,7 +266,19 @@ handle_cast({deliver, ConsumerTag, AckRequired, Msg}, State1 = lock_message(AckRequired, ack_record(DeliveryTag, ConsumerTag, Msg), State), - ok = internal_deliver(WriterPid, ConsumerTag, DeliveryTag, Msg), + + {_QName, QPid, _MsgId, Redelivered, + #basic_message{exchange_name = ExchangeName, + routing_key = RoutingKey, + content = Content}} = Msg, + + M = #'basic.deliver'{consumer_tag = ConsumerTag, + delivery_tag = DeliveryTag, + redelivered = Redelivered, + exchange = ExchangeName#resource.name, + routing_key = RoutingKey}, + rabbit_writer:send_command_and_notify(WriterPid, QPid, self(), M, Content), + {_QName, QPid, _MsgId, _Redelivered, _Msg} = Msg, maybe_incr_stats([{QPid, 1}], case AckRequired of @@ -1240,19 +1252,6 @@ lock_message(true, MsgStruct, State = #ch{unacked_message_q = UAMQ}) -> lock_message(false, _MsgStruct, State) -> State. -internal_deliver(WriterPid, ConsumerTag, DeliveryTag, - {_QName, QPid, _MsgId, Redelivered, - #basic_message{exchange_name = ExchangeName, - routing_key = RoutingKey, - content = Content}}) -> - M = #'basic.deliver'{consumer_tag = ConsumerTag, - delivery_tag = DeliveryTag, - redelivered = Redelivered, - exchange = ExchangeName#resource.name, - routing_key = RoutingKey}, - rabbit_writer:send_command_and_notify(WriterPid, QPid, self(), M, Content), - ok. - terminate(State) -> stop_confirm_timer(State), pg_local:leave(rabbit_channels, self()), |