diff options
| author | Rob Harrop <rharrop@vmware.com> | 2010-09-23 14:04:14 +0100 |
|---|---|---|
| committer | Rob Harrop <rharrop@vmware.com> | 2010-09-23 14:04:14 +0100 |
| commit | 4b25d500157fb4a635474acbf64e03660b10a903 (patch) | |
| tree | dae16a499954b3d31cdc72e27cea84024dda8f7e | |
| parent | 8160a85527a357144234a39f49d9d7d485672430 (diff) | |
| download | rabbitmq-server-git-4b25d500157fb4a635474acbf64e03660b10a903.tar.gz | |
cosmetic, tab clean up
| -rw-r--r-- | src/rabbit_invariable_queue.erl | 18 | ||||
| -rw-r--r-- | src/rabbit_persister.erl | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/rabbit_invariable_queue.erl b/src/rabbit_invariable_queue.erl index 8eb6ebbd73..3b449efa55 100644 --- a/src/rabbit_invariable_queue.erl +++ b/src/rabbit_invariable_queue.erl @@ -123,11 +123,11 @@ dropwhile(_Pred, State = #iv_state { len = 0 }) -> dropwhile(Pred, State = #iv_state { queue = Q }) -> {{value, {Msg, MsgProps, IsDelivered}}, Q1} = queue:out(Q), case Pred(Msg, MsgProps) of - true -> - {_, State1} = fetch_internal(false, Q1, Msg, MsgProps, IsDelivered, State), - dropwhile(Pred, State1); - false -> - State + true -> + {_, State1} = fetch_internal(false, Q1, Msg, MsgProps, IsDelivered, State), + dropwhile(Pred, State1); + false -> + State end. fetch(_AckRequired, State = #iv_state { len = 0 }) -> @@ -137,9 +137,9 @@ fetch(AckRequired, State = #iv_state { queue = Q }) -> fetch_internal(AckRequired, Q1, Msg, MsgProps, IsDelivered, State). fetch_internal(AckRequired, Q1, - Msg = #basic_message {guid = Guid}, - MsgProps, IsDelivered, - State = #iv_state { len = Len, + Msg = #basic_message {guid = Guid}, + MsgProps, IsDelivered, + State = #iv_state { len = Len, qname = QName, durable = IsDurable, pending_ack = PA }) -> @@ -286,7 +286,7 @@ persist_message(QName, true, Txn, Msg = #basic_message { Msg #basic_message.content)}, persist_work(Txn, QName, [{publish, Msg1, MsgProps, - {QName, Msg1 #basic_message.guid}}]); + {QName, Msg1 #basic_message.guid}}]); persist_message(_QName, _IsDurable, _Txn, _Msg, _MsgProps) -> ok. diff --git a/src/rabbit_persister.erl b/src/rabbit_persister.erl index 6c501fc0b6..e50d33235b 100644 --- a/src/rabbit_persister.erl +++ b/src/rabbit_persister.erl @@ -357,7 +357,7 @@ current_snapshot(_Snapshot = #psnapshot{transactions = Ts, %% Avoid infinite growth of the table by removing messages not %% bound to a queue anymore PKeys = ets:foldl(fun ({{_QName, PKey}, _Delivered, - _MsgProps, _SeqId}, S) -> + _MsgProps, _SeqId}, S) -> sets:add_element(PKey, S) end, sets:new(), Queues), prune_table(Messages, fun (Key) -> sets:is_element(Key, PKeys) end), |