diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-04-07 11:24:35 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-04-07 11:24:35 +0100 |
| commit | 5e3ffeb9a8f18153917a89ee1696159eebf631c4 (patch) | |
| tree | 9597d8224c2d85da9960ae719c330f0fd97e3110 | |
| parent | 16d551e7bf2557fcade264a4675b8233991bc388 (diff) | |
| download | rabbitmq-server-git-5e3ffeb9a8f18153917a89ee1696159eebf631c4.tar.gz | |
Tested debitrot; works again.
| -rw-r--r-- | src/rabbit_log.erl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/rabbit_log.erl b/src/rabbit_log.erl index 075a52431b..25debc4255 100644 --- a/src/rabbit_log.erl +++ b/src/rabbit_log.erl @@ -91,8 +91,9 @@ tap_trace_in(Message = #basic_message{exchange_name = #resource{ fun (TraceExchangeBin) -> QInfos = [rabbit_amqqueue:info(#amqqueue{pid = P}, [name]) || P <- QPids], - QNames = [N || [{name, #resource{name = N}}] <- QInfos], - QNamesStr = list_to_binary(rabbit_misc:intersperse(",", QNames)), + QNames = [binary_to_list(N) || + [{name, #resource{name = N}}] <- QInfos], + QNamesStr = list_to_binary(string:join(QNames, ",")), EncodedMessage = message_to_table(Message), maybe_inject(TraceExchangeBin, VHostBin, XNameBin, <<"publish">>, XNameBin, @@ -141,12 +142,11 @@ maybe_inject(TraceExchangeBin, VHostBin, OriginalExchangeBin, TraceExchangeBin =:= OriginalExchangeBin -> ok; true -> - rabbit_exchange:simple_publish( - false, - false, + ContentTypeBin = <<"application/x-amqp-table; version=0-9-1">>, + rabbit_basic:publish( rabbit_misc:r(VHostBin, exchange, TraceExchangeBin), <<RKPrefix/binary, ".", RKSuffix/binary>>, - <<"application/x-amqp-table; version=0-8">>, + #'P_basic'{content_type = ContentTypeBin}, rabbit_binary_generator:generate_table(Table)), ok end. @@ -169,7 +169,7 @@ message_to_table(#basic_message{exchange_name = #resource{name = XName}, app_id = AppId}, payload_fragments_rev = PFR} = rabbit_binary_parser:ensure_content_decoded(Content), - Headers = prune_undefined( + Headers1 = prune_undefined( [{<<"content_type">>, longstr, ContentType}, {<<"content_encoding">>, longstr, ContentEncoding}, {<<"headers">>, table, Headers}, @@ -185,7 +185,7 @@ message_to_table(#basic_message{exchange_name = #resource{name = XName}, {<<"app_id">>, longstr, AppId}]), [{<<"exchange_name">>, longstr, XName}, {<<"routing_key">>, array, [{longstr, K} || K <- RoutingKeys]}, - {<<"headers">>, table, Headers}, + {<<"headers">>, table, Headers1}, {<<"body">>, longstr, list_to_binary(lists:reverse(PFR))}]. prune_undefined(Fields) -> |