diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-08-13 18:05:29 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-08-13 18:05:29 +0100 |
| commit | d75fc298742940d7eba305fdea10e06d0f6bf744 (patch) | |
| tree | cf5f55788ce3649a05aaf9f1a8e398aedace7df8 /src | |
| parent | fc62811384f293e4e82e583b18991f9daaac0cf6 (diff) | |
| download | rabbitmq-server-git-d75fc298742940d7eba305fdea10e06d0f6bf744.tar.gz | |
typo + reformatting
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 7 | ||||
| -rw-r--r-- | src/rabbit_basic.erl | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 082de83a19..cdc8cdd2c5 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -409,8 +409,7 @@ run_message_queue(State = #q{backing_queue = BQ, backing_queue_state = BQS}) -> {_IsEmpty1, State1} = deliver_msgs_to_consumers(Funs, IsEmpty, State), State1. -attempt_delivery(none, _ChPid, Message = #basic_message{msg_seq_no = MsgSeqNo}, - State = #q{backing_queue = BQ}) -> +attempt_delivery(none, _ChPid, Message, State = #q{backing_queue = BQ}) -> PredFun = fun (IsEmpty, _State) -> not IsEmpty end, DeliverFun = fun (AckRequired, false, State1 = #q{backing_queue_state = BQS}) -> @@ -420,8 +419,8 @@ attempt_delivery(none, _ChPid, Message = #basic_message{msg_seq_no = MsgSeqNo}, State1#q{backing_queue_state = BQS1}} end, deliver_msgs_to_consumers({ PredFun, DeliverFun }, false, State); -attempt_delivery(Txn, ChPid, Message, - State = #q{backing_queue = BQ, backing_queue_state = BQS}) -> +attempt_delivery(Txn, ChPid, Message, State = #q{backing_queue = BQ, + backing_queue_state = BQS}) -> record_current_channel_tx(ChPid, Txn), {true, State#q{backing_queue_state = BQ:tx_publish(Txn, Message, BQS)}}. diff --git a/src/rabbit_basic.erl b/src/rabbit_basic.erl index 2682203a8a..62ef33179c 100644 --- a/src/rabbit_basic.erl +++ b/src/rabbit_basic.erl @@ -51,7 +51,7 @@ -spec(publish/1 :: (rabbit_types:delivery()) -> publish_result()). -spec(delivery/4 :: - (boolean(), boolean(), rabbit_types:maybe(rabbit_type:txn()), + (boolean(), boolean(), rabbit_types:maybe(rabbit_types:txn()), rabbit_types:message()) -> rabiit_types:delivery()). -spec(message/4 :: (rabbit_exchange:name(), rabbit_router:routing_key(), |