diff options
| author | Siri Hansen <[email protected]> | 2012-03-05 11:43:08 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2012-03-05 11:43:08 +0100 |
| commit | 096ed7e301ce16dfb69709d7001ea3d5f370c202 (patch) | |
| tree | d2a6f3dd000d2a1ce843d5c687498b9d43cc4879 /lib/stdlib/doc | |
| parent | d1e67d51a6d754e5a055c81c9d7447e0d87e982f (diff) | |
| parent | e6e31791abf090fe7e0bd3e5970b44830d087c4a (diff) | |
| download | otp-096ed7e301ce16dfb69709d7001ea3d5f370c202.tar.gz otp-096ed7e301ce16dfb69709d7001ea3d5f370c202.tar.bz2 otp-096ed7e301ce16dfb69709d7001ea3d5f370c202.zip | |
Merge branch 'siri/stdlib/hanging-restart-loop/OTP-9549' into maint
* siri/stdlib/hanging-restart-loop/OTP-9549:
Leave control back to gen_server during supervisor's restart loop
Diffstat (limited to 'lib/stdlib/doc')
| -rw-r--r-- | lib/stdlib/doc/src/supervisor.xml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml index d1e62230bc..35f4f82264 100644 --- a/lib/stdlib/doc/src/supervisor.xml +++ b/lib/stdlib/doc/src/supervisor.xml @@ -399,10 +399,11 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules} <c>SupRef</c>.</p> <p>If successful, the function returns <c>ok</c>. If the child specification identified by <c><anno>Id</anno></c> exists but - the corresponding child process is running, the function - returns <c>{error,running}</c>. If the child specification - identified by <c><anno>Id</anno></c> does not exist, the function returns - <c>{error,not_found}</c>.</p> + the corresponding child process is running or about to be restarted, + the function returns <c>{error,running}</c> or + <c>{error,restarting}</c> respectively. If the child specification + identified by <c><anno>Id</anno></c> does not exist, the function + returns <c>{error,not_found}</c>.</p> </desc> </func> <func> @@ -462,7 +463,8 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules} </item> <item> <p><c><anno>Child</anno></c> - the pid of the corresponding child - process, or <c>undefined</c> if there is no such process.</p> + process, the atom <c>restarting</c> if the process is about to be + restarted or <c>undefined</c> if there is no such process.</p> </item> <item> <p><c><anno>Type</anno></c> - as defined in the child specification.</p> |