diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-01-10 13:11:35 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-01-10 13:11:35 +0000 |
| commit | a0563673e60e67e139a7f69e5ff9ded5768dd5dc (patch) | |
| tree | 418a4d93f60a04a50fbb245e6cb397e2ab8b9507 | |
| parent | b0638c9bf379bbe9aae5a0205b5401a13b5b90dd (diff) | |
| download | rabbitmq-server-git-a0563673e60e67e139a7f69e5ff9ded5768dd5dc.tar.gz | |
Cosmetic
| -rw-r--r-- | src/rabbit_limiter.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 12 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/rabbit_limiter.erl b/src/rabbit_limiter.erl index 635bf75a55..0532fa7653 100644 --- a/src/rabbit_limiter.erl +++ b/src/rabbit_limiter.erl @@ -324,8 +324,7 @@ update_credit(CTag, Credit, Drain, Credits) -> %% gen_server callbacks %%---------------------------------------------------------------------------- -init([]) -> - {ok, #lim{}}. +init([]) -> {ok, #lim{}}. prioritise_call(get_prefetch_limit, _From, _Len, _State) -> 9; prioritise_call(_Msg, _From, _Len, _State) -> 0. diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index fce500496f..6d70f1bdb2 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -878,17 +878,15 @@ handle_method0(#'connection.tune_ok'{frame_max = FrameMax, frame_max, ?FRAME_MIN_SIZE, FrameMax), ok = validate_negotiated_integer_value( channel_max, ?CHANNEL_MIN, ChannelMax), - {ok, Collector} = - rabbit_connection_helper_sup:start_queue_collector( - SupPid, Connection#connection.name), + {ok, Collector} = rabbit_connection_helper_sup:start_queue_collector( + SupPid, Connection#connection.name), Frame = rabbit_binary_generator:build_heartbeat_frame(), SendFun = fun() -> catch rabbit_net:send(Sock, Frame) end, Parent = self(), ReceiveFun = fun() -> Parent ! heartbeat_timeout end, - Heartbeater = - rabbit_heartbeat:start( - SupPid, Sock, Connection#connection.name, - ClientHeartbeat, SendFun, ClientHeartbeat, ReceiveFun), + Heartbeater = rabbit_heartbeat:start( + SupPid, Sock, Connection#connection.name, + ClientHeartbeat, SendFun, ClientHeartbeat, ReceiveFun), State#v1{connection_state = opening, connection = Connection#connection{ frame_max = FrameMax, |