summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-07-14 16:54:10 +0100
committerSimon MacMullen <simon@rabbitmq.com>2014-07-14 16:54:10 +0100
commitf2c5cd5f7a1f914cab6664f6f8fd97ff5fe7ae6d (patch)
tree6d7a772b3b1d54a64b393d57d635ea2874774670
parent23edc868e261abd316b9de2dba003640dd4facd2 (diff)
downloadrabbitmq-server-f2c5cd5f7a1f914cab6664f6f8fd97ff5fe7ae6d.tar.gz
Reset restarts before we go round again, otherwise if MaxT is large we will keep looping until it clears.
-rw-r--r--src/supervisor2.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/supervisor2.erl b/src/supervisor2.erl
index db4c388a..90fb0423 100644
--- a/src/supervisor2.erl
+++ b/src/supervisor2.erl
@@ -917,7 +917,7 @@ do_restart_delay({RestartType, Delay}, Reason, Child, State) ->
_TRef = erlang:send_after(trunc(Delay*1000), self(),
{delayed_restart,
{{RestartType, Delay}, Reason, Child}}),
- {ok, state_del_child(Child, State)}
+ {ok, state_del_child(Child, State#state{restarts = []})}
end.
restart(Child, State) ->