diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-09-26 18:16:00 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-09-26 18:16:00 +0100 |
| commit | e264fb9476ed2d7b9e01006187f56f9f70b849ad (patch) | |
| tree | d1c5fce89d649cd8877fff4e2709f027f83cfd29 | |
| parent | 1fc1f219f7b966f486c580fbcd2fd0da396fc3d7 (diff) | |
| download | rabbitmq-server-git-e264fb9476ed2d7b9e01006187f56f9f70b849ad.tar.gz | |
s/redelivered/delivered/g
| -rw-r--r-- | include/rabbit.hrl | 2 | ||||
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 10 | ||||
| -rw-r--r-- | src/rabbit_variable_queue.erl | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 19fc8ff75b..f238958751 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -79,7 +79,7 @@ -record(event, {type, props, timestamp}). -record(message_properties, {expiry, needs_confirming = false, - redelivered = false}). + delivered = false}). -record(plugin, {name, %% atom() version, %% string() diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index a6f494739a..3bf291e798 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -545,7 +545,7 @@ attempt_delivery(#delivery{sender = SenderPid, message = Message}, Props, {AckTag, BQS3} = BQ:publish_delivered( AckRequired, Message, Props, SenderPid, BQS2), - {{Message, Props#message_properties.redelivered, AckTag}, + {{Message, Props#message_properties.delivered, AckTag}, true, State1#q{backing_queue_state = BQS3}} end, false, State#q{backing_queue_state = BQS1}); {Duplicate, BQS1} -> @@ -561,10 +561,10 @@ attempt_delivery(#delivery{sender = SenderPid, message = Message}, Props, end. deliver_or_enqueue(Delivery = #delivery{message = Message, - sender = SenderPid}, Redelivered, + sender = SenderPid}, Delivered, State) -> Confirm = should_confirm_message(Delivery, State), - Props = message_properties(Confirm, Redelivered, State), + Props = message_properties(Confirm, Delivered, State), case attempt_delivery(Delivery, Props, State) of {true, State1} -> maybe_record_confirm_message(Confirm, State1); @@ -704,10 +704,10 @@ discard_delivery(#delivery{sender = SenderPid, backing_queue_state = BQS}) -> State#q{backing_queue_state = BQ:discard(Message, SenderPid, BQS)}. -message_properties(Confirm, Redelivered, #q{ttl = TTL}) -> +message_properties(Confirm, Delivered, #q{ttl = TTL}) -> #message_properties{expiry = calculate_msg_expiry(TTL), needs_confirming = needs_confirming(Confirm), - redelivered = Redelivered}. + delivered = Delivered}. calculate_msg_expiry(undefined) -> undefined; calculate_msg_expiry(TTL) -> now_micros() + (TTL * 1000). diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 7af2927941..68c659dfbe 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -874,10 +874,10 @@ gb_sets_maybe_insert(false, _Val, Set) -> Set; gb_sets_maybe_insert(true, Val, Set) -> gb_sets:add(Val, Set). msg_status(IsPersistent, SeqId, Msg = #basic_message { id = MsgId }, - MsgProps = #message_properties{redelivered = Redelivered}) -> + MsgProps = #message_properties{delivered = Delivered}) -> %% TODO would it make sense to remove #msg_status.is_delivered? #msg_status { seq_id = SeqId, msg_id = MsgId, msg = Msg, - is_persistent = IsPersistent, is_delivered = Redelivered, + is_persistent = IsPersistent, is_delivered = Delivered, msg_on_disk = false, index_on_disk = false, msg_props = MsgProps }. |