diff options
| -rw-r--r-- | src/lager_exchange_backend.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_basic.erl | 5 | ||||
| -rw-r--r-- | src/rabbit_trace.erl | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/lager_exchange_backend.erl b/src/lager_exchange_backend.erl index 6e492f649d..2b657e9041 100644 --- a/src/lager_exchange_backend.erl +++ b/src/lager_exchange_backend.erl @@ -165,8 +165,8 @@ handle_log_event({log, Message}, headers = Headers}, Body = rabbit_data_coercion:to_binary(Formatter:format(Message, FormatConfig)), case rabbit_basic:publish(LogExch, RoutingKey, AmqpMsg, Body) of - {ok, _DeliveredQPids} -> ok; - {error, not_found} -> ok + ok -> ok; + {error, not_found} -> ok end, {ok, State}; false -> diff --git a/src/rabbit_basic.erl b/src/rabbit_basic.erl index 40c60ece45..cfd7709d15 100644 --- a/src/rabbit_basic.erl +++ b/src/rabbit_basic.erl @@ -30,7 +30,7 @@ -type properties_input() :: rabbit_framing:amqp_property_record() | [{atom(), any()}]. -type publish_result() :: - {ok, [pid()]} | rabbit_types:error('not_found'). + ok | rabbit_types:error('not_found'). -type header() :: any(). -type headers() :: rabbit_framing:amqp_table() | 'undefined'. @@ -76,8 +76,7 @@ publish(Delivery = #delivery{ publish(X, Delivery) -> Qs = rabbit_amqqueue:lookup(rabbit_exchange:route(X, Delivery)), - DeliveredQPids = rabbit_amqqueue:deliver(Qs, Delivery), - {ok, DeliveredQPids}. + rabbit_amqqueue:deliver(Qs, Delivery). -spec delivery (boolean(), boolean(), rabbit_types:message(), undefined | integer()) -> diff --git a/src/rabbit_trace.erl b/src/rabbit_trace.erl index 2c85de2f3a..64f197e899 100644 --- a/src/rabbit_trace.erl +++ b/src/rabbit_trace.erl @@ -106,7 +106,7 @@ trace(#exchange{name = Name}, #basic_message{exchange_name = Name}, ok; trace(X, Msg = #basic_message{content = #content{payload_fragments_rev = PFR}}, RKPrefix, RKSuffix, Extra) -> - {ok, _} = rabbit_basic:publish( + ok = rabbit_basic:publish( X, <<RKPrefix/binary, ".", RKSuffix/binary>>, #'P_basic'{headers = msg_to_table(Msg) ++ Extra}, PFR), ok. |