diff options
| author | Siri Hansen <[email protected]> | 2012-10-15 13:57:14 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2012-10-15 13:57:39 +0200 |
| commit | 8b201631300556d5e93556062f7a615cdd1a6708 (patch) | |
| tree | d3615b7f1dbe422d88c1e53866c650b6ddf5cd32 /lib/stdlib/doc/src | |
| parent | 16d74de34df5fcfed25c55f0ee52cbb01e4169cb (diff) | |
| parent | 95af7e7bec94d9ee2ba7cbbe4aa045862ddcd386 (diff) | |
| download | otp-8b201631300556d5e93556062f7a615cdd1a6708.tar.gz otp-8b201631300556d5e93556062f7a615cdd1a6708.tar.bz2 otp-8b201631300556d5e93556062f7a615cdd1a6708.zip | |
Merge branch 'tp/supervisor-pass-on-errors'
* tp/supervisor-pass-on-errors:
If supervisor:start_link fails to start child, add child id to error reason
Fix documentation about how supervisor handles crash in child's start function
Have supervisor send errors up the chain
OTP-10490
Diffstat (limited to 'lib/stdlib/doc/src')
| -rw-r--r-- | lib/stdlib/doc/src/supervisor.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml index f9a5e245b4..9021d02ade 100644 --- a/lib/stdlib/doc/src/supervisor.xml +++ b/lib/stdlib/doc/src/supervisor.xml @@ -294,10 +294,10 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules} is a term with information about the error, and the supervisor terminates with reason <c>Term</c>.</p> <p>If any child process start function fails or returns an error - tuple or an erroneous value, the function returns - <c>{error,shutdown}</c> and the supervisor terminates all - started child processes and then itself with reason - <c>shutdown</c>.</p> + tuple or an erroneous value, the supervisor will first terminate + all already started child processes with reason <c>shutdown</c> + and then terminate itself and return + <c>{error, {shutdown, Reason}}</c>.</p> </desc> </func> <func> |