summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2013-01-27 19:28:51 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2013-01-27 19:28:51 +0000
commit488c3781a3b9211078b8c11295333e159fce7a02 (patch)
tree0132c4be87041d716f81cde9ecdba2891e5edf6a
parent711290d644b3e43e0805ced7b83747b7520b8633 (diff)
downloadrabbitmq-server-488c3781a3b9211078b8c11295333e159fce7a02.tar.gz
move bits of docs around
in order to eliminate "forward references" to new features
-rw-r--r--src/supervisor2.erl16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/supervisor2.erl b/src/supervisor2.erl
index 89e78703..cbca993c 100644
--- a/src/supervisor2.erl
+++ b/src/supervisor2.erl
@@ -5,7 +5,14 @@
%%
%% 2) a find_child/2 utility function has been added
%%
-%% 3) child specifications can contain, as the restart type, a tuple
+%% 3) Added an 'intrinsic' restart type. Like the transient type, this
+%% type means the child should only be restarted if the child exits
+%% abnormally. Unlike the transient type, if the child exits
+%% normally, the supervisor itself also exits normally. If the
+%% child is a supervisor and it exits normally (i.e. with reason of
+%% 'shutdown') then the child's parent also exits normally.
+%%
+%% 4) child specifications can contain, as the restart type, a tuple
%% {permanent, Delay} | {transient, Delay} | {intrinsic, Delay}
%% where Delay >= 0 (see point (4) below for intrinsic). The delay,
%% in seconds, indicates what should happen if a child, upon being
@@ -38,13 +45,6 @@
%% perspective it's a normal exit, whilst from supervisor's
%% perspective, it's an abnormal exit.
%%
-%% 4) Added an 'intrinsic' restart type. Like the transient type, this
-%% type means the child should only be restarted if the child exits
-%% abnormally. Unlike the transient type, if the child exits
-%% normally, the supervisor itself also exits normally. If the
-%% child is a supervisor and it exits normally (i.e. with reason of
-%% 'shutdown') then the child's parent also exits normally.
-%%
%% 5) normal, and {shutdown, _} exit reasons are all treated the same
%% (i.e. are regarded as normal exits)
%%