diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-01-11 13:41:57 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-01-11 13:41:57 +0000 |
| commit | 8b273beb6e40b0647e1ee8e532f57b4220785bd0 (patch) | |
| tree | d627f0bae0b6f25785ebdaf4d91530692abdf9c7 | |
| parent | bd62075c64e9a18763a89182a62202138455545b (diff) | |
| download | rabbitmq-server-8b273beb6e40b0647e1ee8e532f57b4220785bd0.tar.gz | |
Optimise the heartbeat to death. Honk. And some cosmetics too
| -rw-r--r-- | src/rabbit_connection_sup.erl | 1 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 13 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/rabbit_connection_sup.erl b/src/rabbit_connection_sup.erl index ff3995b5..a6b1f7fa 100644 --- a/src/rabbit_connection_sup.erl +++ b/src/rabbit_connection_sup.erl @@ -78,4 +78,3 @@ reader(Pid) -> init([]) -> {ok, {{one_for_all, 0, 1}, []}}. - diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index a3292d35..e9f34a0f 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -770,17 +770,10 @@ handle_method0(#'connection.tune_ok'{frame_max = FrameMax, not_allowed, "frame_max=~w > ~w max size", [FrameMax, ?FRAME_MAX]); true -> - SendFun = - fun() -> - Frame = rabbit_binary_generator:build_heartbeat_frame(), - catch rabbit_net:send(Sock, Frame) - end, - + Frame = rabbit_binary_generator:build_heartbeat_frame(), + SendFun = fun() -> catch rabbit_net:send(Sock, Frame) end, Parent = self(), - ReceiveFun = - fun() -> - Parent ! timeout - end, + ReceiveFun = fun() -> Parent ! timeout end, Heartbeater = SHF(Sock, ClientHeartbeat, SendFun, ClientHeartbeat, ReceiveFun), State#v1{connection_state = opening, |