diff options
| author | Hans Nilsson <[email protected]> | 2018-02-22 12:13:18 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-02-22 12:13:18 +0100 |
| commit | 41979694d18637c62433a44aaf4a07b2e02e104d (patch) | |
| tree | e3be25825b8cb63e693f640840ab2dfa79f11d45 /lib/ssh/src/ssh_acceptor_sup.erl | |
| parent | 1540a0758b8d60af7b3832158015bd8cf64016af (diff) | |
| parent | 398dcda0815f12fb177bbb3bf68f6b424c2a62f2 (diff) | |
| download | otp-41979694d18637c62433a44aaf4a07b2e02e104d.tar.gz otp-41979694d18637c62433a44aaf4a07b2e02e104d.tar.bz2 otp-41979694d18637c62433a44aaf4a07b2e02e104d.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
ssh: Add option save_accepted_host
ssh: No error message for signal kill
ssh: Dont repeat supervisor defaults in map fields
ssh: Move starting of channel child to ssh_channel_sup
ssh: Test case for sup tree when shell server proc times out
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/ssh/src/ssh_acceptor_sup.erl')
| -rw-r--r-- | lib/ssh/src/ssh_acceptor_sup.erl | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/ssh/src/ssh_acceptor_sup.erl b/lib/ssh/src/ssh_acceptor_sup.erl index a24664793b..fc564a359b 100644 --- a/lib/ssh/src/ssh_acceptor_sup.erl +++ b/lib/ssh/src/ssh_acceptor_sup.erl @@ -86,10 +86,7 @@ child_spec(Address, Port, Profile, Options) -> Timeout = ?GET_INTERNAL_OPT(timeout, Options, ?DEFAULT_TIMEOUT), #{id => id(Address, Port, Profile), start => {ssh_acceptor, start_link, [Port, Address, Options, Timeout]}, - restart => transient, - shutdown => 5500, %brutal_kill, - type => worker, - modules => [ssh_acceptor] + restart => transient % because a crashed listener could be replaced by a new one }. id(Address, Port, Profile) -> |