diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-09-06 15:56:20 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-09-06 15:56:20 +0100 |
| commit | ccceb9a0da73e27fa1fb285486edc19f31936eaa (patch) | |
| tree | 16f5d4d63a6b36dcd70e7126ca75ab3a389a29c7 | |
| parent | 0b99899cc82634fd1b9ee2c962355eac83c2e9ec (diff) | |
| download | rabbitmq-server-ccceb9a0da73e27fa1fb285486edc19f31936eaa.tar.gz | |
Factoring; avoid record syntax when we're violating a record's type
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 5 | ||||
| -rw-r--r-- | src/rabbit_variable_queue.erl | 13 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index 22755635..54cdda9f 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -931,7 +931,8 @@ format_sender_queues(SQ) -> || {ChPid, {MQ, PendingCh}} <- dict:to_list(SQ)]. format_sender_queue(MQ) -> - [{Delivery #delivery { message = Msg #basic_message { content = '_' } }, - EnqueueOnPromotion} + [{Delivery #delivery { + message = setelement(#basic_message.content, Msg, '_') }, + EnqueueOnPromotion} || {Delivery = #delivery { message = Msg }, EnqueueOnPromotion} <- queue:to_list(MQ)]. diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 76db9f95..b569fdcc 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -749,11 +749,12 @@ format_status(State = #vqstate { q1 = Q1, {#vqstate.q3, format_bpqueue(Q3)}, {#vqstate.q4, format_queue(Q4)}, {#vqstate.pending_ack, format_pending_acks(PA)}, - {#vqstate.ram_ack_index, gb_trees:to_list(RAI)}, - {#vqstate.msgs_on_disk, gb_sets:to_list(MOD)}, - {#vqstate.msg_indices_on_disk, gb_sets:to_list(MIOD)}, - {#vqstate.unconfirmed, gb_sets:to_list(UC)}, - {#vqstate.confirmed, gb_sets:to_list(C)}], State). + {#vqstate.ram_ack_index, gb_trees:to_list(RAI)} | + [{Pos, gb_sets:to_list(Set)} || + {Pos, Set} <- [{#vqstate.msgs_on_disk, MOD}, + {#vqstate.msg_indices_on_disk, MIOD}, + {#vqstate.unconfirmed, UC}, + {#vqstate.confirmed, C}]]], State). %%---------------------------------------------------------------------------- %% Minor helpers @@ -818,7 +819,7 @@ format_pending_acks(PA) -> end, [], PA). format_msg_status(MsgStatus = #msg_status { msg = undefined }) -> MsgStatus; -format_msg_status(MsgStatus) -> MsgStatus #msg_status { msg = '_' }. +format_msg_status(MsgStatus) -> setelement(#msg_status.msg, MsgStatus, '_'). msg_status(IsPersistent, SeqId, Msg = #basic_message { id = MsgId }, MsgProps) -> |