diff options
author | Tim Watson <tim@rabbitmq.com> | 2012-09-03 17:00:02 +0100 |
---|---|---|
committer | Tim Watson <tim@rabbitmq.com> | 2012-09-03 17:00:02 +0100 |
commit | 9c50bea971407e86a6b2400489c701b7eba34217 (patch) | |
tree | fc064a330cd5267cad7e81f6af4fbd67c56ab762 | |
parent | 88181f450c06190d0de3f5b6104c0ba2f998e121 (diff) | |
download | rabbitmq-server-9c50bea971407e86a6b2400489c701b7eba34217.tar.gz |
construct child exit reason in the right place
-rw-r--r-- | src/supervisor2.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/supervisor2.erl b/src/supervisor2.erl index 89a8fd92..9644e17d 100644 --- a/src/supervisor2.erl +++ b/src/supervisor2.erl @@ -837,7 +837,8 @@ terminate_simple_children(Child, Dynamics, SupName) -> (Pid, {error, R}) -> ReportError(R, Child#child{pid = Pid}) end, [receive - {'EXIT', Pid, Reason} -> Report(Pid, Reason) + {'EXIT', Pid, Reason} -> + Report(Pid, child_res(Child, Reason, Timedout)) after 0 -> Report(Pid, Reply) end || {Pid, Reply} <- Replies], |