diff options
author | Henrik Nord <[email protected]> | 2011-08-30 10:42:08 +0200 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2011-08-30 10:42:16 +0200 |
commit | 6f81b23c61610373f96681a4ca85ca9701873ec6 (patch) | |
tree | 27e3071e01ebdf56f2d55bd85f929c446990c139 /lib/stdlib/doc/src/supervisor.xml | |
parent | 036f82b9d3e664ec326f1a303d4f990848d94b96 (diff) | |
parent | 4f9b938112a80f1c1e210b1a6af40a42f833cfa2 (diff) | |
download | otp-6f81b23c61610373f96681a4ca85ca9701873ec6.tar.gz otp-6f81b23c61610373f96681a4ca85ca9701873ec6.tar.bz2 otp-6f81b23c61610373f96681a4ca85ca9701873ec6.zip |
Merge branch 'ft/fix_supervisor_temporary_restart' into dev
OTP-9502
Diffstat (limited to 'lib/stdlib/doc/src/supervisor.xml')
-rw-r--r-- | lib/stdlib/doc/src/supervisor.xml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml index 009aa60faa..edd119d37a 100644 --- a/lib/stdlib/doc/src/supervisor.xml +++ b/lib/stdlib/doc/src/supervisor.xml @@ -150,9 +150,12 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules} <p><c>Restart</c> defines when a terminated child process should be restarted. A <c>permanent</c> child process should always be restarted, a <c>temporary</c> child process should - never be restarted and a <c>transient</c> child process - should be restarted only if it terminates abnormally, i.e. - with another exit reason than <c>normal</c>.</p> + never be restarted (even when the supervisor's restart strategy + is <c>rest_for_one</c> or <c>one_for_all</c> and a sibling's + death causes the temporary process to be terminated) and a + <c>transient</c> child process should be restarted only if + it terminates abnormally, i.e. with another exit reason + than <c>normal</c>.</p> </item> <item> <p><c>Shutdown</c> defines how a child process should be |