summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2012-03-21 13:23:25 +0000
committerMatthew Sackman <matthew@rabbitmq.com>2012-03-21 13:23:25 +0000
commitbcf82b2bbb475940b24557c7f227ef6d495b4d21 (patch)
tree0b9a8bb1965b96fddb3aea967de70e34698154da
parent5b6410ac7aacf1d1bb9ae3d9df5a30f7d45a66cf (diff)
downloadrabbitmq-server-git-bcf82b2bbb475940b24557c7f227ef6d495b4d21.tar.gz
And if an {intrinsic, Delay} child exits normally/shutdown, remember to really exit the supervisor.
-rw-r--r--src/supervisor2.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/supervisor2.erl b/src/supervisor2.erl
index fd5f0f302f..774b70070e 100644
--- a/src/supervisor2.erl
+++ b/src/supervisor2.erl
@@ -565,6 +565,8 @@ do_restart_delay({RestartType, Delay}, Reason, Child, State) ->
del_child_and_maybe_shutdown(intrinsic, Child, State) ->
{shutdown, state_del_child(Child, State)};
+del_child_and_maybe_shutdown({intrinsic, _Delay}, Child, State) ->
+ {shutdown, state_del_child(Child, State)};
del_child_and_maybe_shutdown(_, Child, State) ->
{ok, state_del_child(Child, State)}.