diff options
| author | Hans Nilsson <[email protected]> | 2016-06-07 11:50:34 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-06-07 11:50:34 +0200 |
| commit | 5b0547269daacd1d7c25dfc060cd309c3d89f279 (patch) | |
| tree | f242b2f5b31cb7059275194720d5bf4aa41bcd0a /lib/ssh/src/ssh_system_sup.erl | |
| parent | 40799264e140c20a65a65123ed0ab8980376ddd1 (diff) | |
| parent | 3cd8fe84c7a3b1f40d824d243447e4bf82ac28b3 (diff) | |
| download | otp-5b0547269daacd1d7c25dfc060cd309c3d89f279.tar.gz otp-5b0547269daacd1d7c25dfc060cd309c3d89f279.tar.bz2 otp-5b0547269daacd1d7c25dfc060cd309c3d89f279.zip | |
Merge branch 'hans/ssh/use_open_socket/OTP-12860'
Diffstat (limited to 'lib/ssh/src/ssh_system_sup.erl')
| -rw-r--r-- | lib/ssh/src/ssh_system_sup.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl index 5035bc8f80..e97ac7b01a 100644 --- a/lib/ssh/src/ssh_system_sup.erl +++ b/lib/ssh/src/ssh_system_sup.erl @@ -131,7 +131,10 @@ init([ServerOpts]) -> RestartStrategy = one_for_one, MaxR = 0, MaxT = 3600, - Children = child_specs(ServerOpts), + Children = case proplists:get_value(asocket,ServerOpts) of + undefined -> child_specs(ServerOpts); + _ -> [] + end, {ok, {{RestartStrategy, MaxR, MaxT}, Children}}. %%%========================================================================= |