diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-11-07 12:42:55 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-11-07 12:42:55 +0000 |
| commit | 8310e0bd8b4f2ddeae5549ec23883b675f20a73e (patch) | |
| tree | 440a5c3dea890c8a45a8eaeca8568ca86ff0016d | |
| parent | 2d97f53fd40c10ea6e2bdff51f4c1f792ca55800 (diff) | |
| download | rabbitmq-server-bug24430.tar.gz | |
Cosmeticbug24430
| -rw-r--r-- | src/supervisor2.erl | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/supervisor2.erl b/src/supervisor2.erl index b9c82414..f75da872 100644 --- a/src/supervisor2.erl +++ b/src/supervisor2.erl @@ -695,21 +695,19 @@ child_res(#child{restart_type={permanent,_}},normal, false) -> {error, normal}; child_res(#child{}, normal, false) -> ok; child_res(#child{}, R, _) -> {error, R}. -timeout_start(#child{shutdown = Time}, TimeoutMsg) - when is_integer(Time) -> - erlang:send_after(Time, self(), TimeoutMsg); -timeout_start(#child{}, _TimeoutMsg) -> +timeout_start(#child{shutdown = Time}, Msg) when is_integer(Time) -> + erlang:send_after(Time, self(), Msg); +timeout_start(#child{}, _Msg) -> ok. -timeout_stop(#child{shutdown = Time}, TRef, TimeoutMsg, false) - when is_integer(Time) -> +timeout_stop(#child{shutdown = Time}, TRef, Msg, false) when is_integer(Time) -> erlang:cancel_timer(TRef), receive - TimeoutMsg -> ok + Msg -> ok after 0 -> ok end; -timeout_stop(#child{}, ok, _TimeoutMsg, _Timedout) -> +timeout_stop(#child{}, ok, _Msg, _Timedout) -> ok. do_terminate(Child, SupName) when Child#child.pid =/= undefined -> |