diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-09-05 05:26:04 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-09-05 05:26:04 +0100 |
| commit | c9f3384cd43789d50c178b4cc8f2bfc5628d2444 (patch) | |
| tree | 2e886c2eb95aec12b4dee018b26f506a337cb265 | |
| parent | 460848846718c1e78cb975557ba10a50e62196a4 (diff) | |
| parent | 5cbcf422572b9c9acc4b2110a0b7d9abdbd4c0da (diff) | |
| download | rabbitmq-server-git-c9f3384cd43789d50c178b4cc8f2bfc5628d2444.tar.gz | |
merge heads
| -rw-r--r-- | src/rabbit_connection_sup.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_writer.erl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_connection_sup.erl b/src/rabbit_connection_sup.erl index 69e21d73cc..b3821d3b8b 100644 --- a/src/rabbit_connection_sup.erl +++ b/src/rabbit_connection_sup.erl @@ -88,12 +88,12 @@ start_heartbeat_fun(SupPid) -> SupPid, {heartbeat_sender, {rabbit_heartbeat, start_heartbeat_sender, [Parent, Sock, TimeoutSec]}, - intrinsic, ?MAX_WAIT, worker, [rabbit_heartbeat]}), + transient, ?MAX_WAIT, worker, [rabbit_heartbeat]}), {ok, Receiver} = supervisor2:start_child( SupPid, {heartbeat_receiver, {rabbit_heartbeat, start_heartbeat_receiver, [Parent, Sock, TimeoutSec]}, - intrinsic, ?MAX_WAIT, worker, [rabbit_heartbeat]}), + transient, ?MAX_WAIT, worker, [rabbit_heartbeat]}), {Sender, Receiver} end. diff --git a/src/rabbit_writer.erl b/src/rabbit_writer.erl index feb214c275..aa986e542b 100644 --- a/src/rabbit_writer.erl +++ b/src/rabbit_writer.erl @@ -171,8 +171,8 @@ call(Pid, Msg) -> assemble_frames(Channel, MethodRecord, Protocol) -> ?LOGMESSAGE(out, Channel, MethodRecord, none), - rabbit_binary_generator:build_simple_method_frame(Channel, MethodRecord, - Protocol). + rabbit_binary_generator:build_simple_method_frame( + Channel, MethodRecord, Protocol). assemble_frames(Channel, MethodRecord, Content, FrameMax, Protocol) -> ?LOGMESSAGE(out, Channel, MethodRecord, Content), |