summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2010-09-01 14:58:08 +0100
committerSimon MacMullen <simon@rabbitmq.com>2010-09-01 14:58:08 +0100
commit5cbcf422572b9c9acc4b2110a0b7d9abdbd4c0da (patch)
treec6e93c19df94056f3f0f1f67f3e7f4d1ca526293
parent91f3b2a5e93305a7b4b0faf0785d716e72dab6f8 (diff)
parent544ea9793ddba34c6375a48f626f7b566810284f (diff)
downloadrabbitmq-server-git-5cbcf422572b9c9acc4b2110a0b7d9abdbd4c0da.tar.gz
Merge bug23197 (missed heartbeat may not get logged)
-rw-r--r--src/rabbit_connection_sup.erl4
1 files changed, 2 insertions, 2 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.