diff options
| author | Michael Bridgen <mikeb@lshift.net> | 2010-02-15 15:48:46 +0000 |
|---|---|---|
| committer | Michael Bridgen <mikeb@lshift.net> | 2010-02-15 15:48:46 +0000 |
| commit | fca3940ad43e5c8cdc259675fa2fca2992d21808 (patch) | |
| tree | 314508b4c21dc1e76711e5e475bce0245612b5d3 | |
| parent | 49ab8180083621226a201b96cb98f939e066c415 (diff) | |
| download | rabbitmq-server-fca3940ad43e5c8cdc259675fa2fca2992d21808.tar.gz | |
Fix up things that dialyze complains about
| -rw-r--r-- | src/rabbit_channel.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_exchange.erl | 9 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 2 |
3 files changed, 2 insertions, 11 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 6c095a58..f5360796 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -600,7 +600,7 @@ handle_method(#'basic.recover_async'{requeue = false}, internal_deliver( WriterPid, false, ConsumerTag, DeliveryTag, {QName, QPid, MsgId, true, Message}) - end, queue:to_list(UAMQ)), + end, ok, UAMQ), %% No answer required - basic.recover is the newer, synchronous %% variant of this method {noreply, State}; diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index 1d4e41dd..9a88d72c 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -363,15 +363,6 @@ delete_forward_routes(Route) -> delete_transient_forward_routes(Route) -> ok = mnesia:delete_object(rabbit_route, Route, write). -exchanges_for_queue(QueueName) -> - MatchHead = reverse_route( - #route{binding = #binding{exchange_name = '$1', - queue_name = QueueName, - _ = '_'}}), - sets:to_list( - sets:from_list( - mnesia:select(rabbit_reverse_route, [{MatchHead, [], ['$1']}]))). - contains(Table, MatchHead) -> try continue(mnesia:select(Table, [{MatchHead, [], ['$_']}], 1, read)) diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 738f7e3f..472173f0 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -601,7 +601,7 @@ handle_method0(#'connection.tune_ok'{channel_max = _ChannelMax, if (FrameMax =< ?FRAME_MIN_SIZE) or (?FRAME_MAX /= 0) and (FrameMax > ?FRAME_MAX) -> rabbit_misc:protocol_error( - mistuned, "peer sent tune_ok with invalid frame_max"); + mistuned, "peer sent tune_ok with invalid frame_max", []); %% If we have a channel_max limit that the client wishes to %% exceed, die as per spec. Not currently a problem, so we ignore %% the client's channel_max parameter. |