diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-04-07 16:59:44 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-04-07 16:59:44 +0100 |
| commit | 4d02f11fcc3c6a52a5e2b4afb07f8420c1793bfa (patch) | |
| tree | 1991954de813659a80236d7a19be91f6de4ea436 /src | |
| parent | 4f9167dbb5625438d9eb1d00c0e221c22a1f2587 (diff) | |
| download | rabbitmq-server-git-4d02f11fcc3c6a52a5e2b4afb07f8420c1793bfa.tar.gz | |
Cosmetic.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_log.erl | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/src/rabbit_log.erl b/src/rabbit_log.erl index 90e8fdd628..8cd980ea53 100644 --- a/src/rabbit_log.erl +++ b/src/rabbit_log.erl @@ -82,22 +82,22 @@ error(Fmt) -> error(Fmt, Args) when is_list(Args) -> gen_server:cast(?SERVER, {error, Fmt, Args}). -tap_trace_in(Message = #basic_message{exchange_name = #resource{ - virtual_host = VHostBin, - name = XNameBin}}) -> +tap_trace_in(Message = #basic_message{ + exchange_name = #resource{virtual_host = VHostBin, + name = XNameBin}}) -> check_trace( XNameBin, VHostBin, fun (TraceExchangeBin) -> {EncodedMetadata, Payload} = message_to_table(Message), - inject(TraceExchangeBin, VHostBin, <<"publish">>, - XNameBin, EncodedMetadata, Payload) + publish(TraceExchangeBin, VHostBin, <<"publish">>, XNameBin, + EncodedMetadata, Payload) end). tap_trace_out({#resource{name = QNameBin}, _QPid, _QMsgId, Redelivered, - Message = #basic_message{exchange_name = #resource{ - virtual_host = VHostBin, - name = XNameBin}}}, + Message = #basic_message{ + exchange_name = #resource{virtual_host = VHostBin, + name = XNameBin}}}, DeliveryTag, ConsumerTagOrNone) -> check_trace( @@ -110,14 +110,12 @@ tap_trace_out({#resource{name = QNameBin}, _QPid, _QMsgId, Redelivered, {<<"redelivered">>, signedint, RedeliveredNum}] ++ EncodedMetadata, Fields = case ConsumerTagOrNone of - none -> - Fields0; - ConsumerTag -> - [{<<"consumer_tag">>, longstr, ConsumerTag} - | Fields0] + none -> Fields0; + CTag -> [{<<"consumer_tag">>, longstr, CTag} | + Fields0] end, - inject(TraceExchangeBin, VHostBin, <<"deliver">>, - QNameBin, Fields, Payload) + publish(TraceExchangeBin, VHostBin, <<"deliver">>, QNameBin, + Fields, Payload) end). check_trace(XNameBin, VHostBin, F) -> @@ -130,12 +128,10 @@ check_trace(XNameBin, VHostBin, F) -> ok -> ok end. -inject(TraceExchangeBin, VHostBin, RKPrefix, RKSuffix, Table, Payload) -> - rabbit_basic:publish( - rabbit_misc:r(VHostBin, exchange, TraceExchangeBin), - <<RKPrefix/binary, ".", RKSuffix/binary>>, - #'P_basic'{headers = Table}, - Payload), +publish(TraceExchangeBin, VHostBin, RKPrefix, RKSuffix, Table, Payload) -> + rabbit_basic:publish(rabbit_misc:r(VHostBin, exchange, TraceExchangeBin), + <<RKPrefix/binary, ".", RKSuffix/binary>>, + #'P_basic'{headers = Table}, Payload), ok. message_to_table(#basic_message{exchange_name = #resource{name = XName}, |