diff options
| author | Ben Hood <0x6e6562@gmail.com> | 2008-08-06 16:06:52 +0100 |
|---|---|---|
| committer | Ben Hood <0x6e6562@gmail.com> | 2008-08-06 16:06:52 +0100 |
| commit | 23831a0ecbe779d015f1d5923ab05cd460db3b89 (patch) | |
| tree | aab1b63f4ae9a4b85c50c3cba0da904bef2c3042 /src | |
| parent | 6328bcfc00f4a0cc21fc88a9e7b5b79e20e0d1dc (diff) | |
| download | rabbitmq-server-git-23831a0ecbe779d015f1d5923ab05cd460db3b89.tar.gz | |
Some more fixes for QA comments
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_channel.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_error_logger.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_exchange.erl | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 6719a9745e..a116c33dfe 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -227,7 +227,8 @@ handle_method(#'channel.close'{}, _, State = #ch{writer_pid = WriterPid}) -> ok = rabbit_writer:shutdown(WriterPid), stop; -handle_method(#'access.request'{},_, State) -> {reply, #'access.request_ok'{ticket = 1}, State}; +handle_method(#'access.request'{},_, State) -> + {reply, #'access.request_ok'{ticket = 1}, State}; handle_method(#'basic.publish'{exchange = ExchangeNameBin, routing_key = RoutingKey, diff --git a/src/rabbit_error_logger.erl b/src/rabbit_error_logger.erl index e4ce3aa3df..9220d7b46f 100644 --- a/src/rabbit_error_logger.erl +++ b/src/rabbit_error_logger.erl @@ -34,7 +34,7 @@ init([DefaultVHost]) -> #exchange{} = rabbit_exchange:declare( - rabbit_misc:r(DefaultVHost,exchange,?LOG_EXCH_NAME), + rabbit_misc:r(DefaultVHost, exchange, ?LOG_EXCH_NAME), topic, true, false, []), {ok, #resource{virtual_host = DefaultVHost, kind = exchange, diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index d0f3f80a2b..cd5511aa6a 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -90,15 +90,15 @@ recover_durable_exchanges() -> end, ok, durable_exchanges) end). -declare(Resource = #resource{}, Type, Durable, AutoDelete, Args) -> - Exchange = #exchange{name = Resource, +declare(ExchangeName = #resource{}, Type, Durable, AutoDelete, Args) -> + Exchange = #exchange{name = ExchangeName, type = Type, durable = Durable, auto_delete = AutoDelete, arguments = Args}, rabbit_misc:execute_mnesia_transaction( fun () -> - case mnesia:wread({exchange, Resource}) of + case mnesia:wread({exchange, ExchangeName}) of [] -> ok = mnesia:write(Exchange), if Durable -> ok = mnesia:write( |