aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh_system_sup.erl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-02-22 12:13:18 +0100
committerHans Nilsson <[email protected]>2018-02-22 12:13:18 +0100
commit41979694d18637c62433a44aaf4a07b2e02e104d (patch)
treee3be25825b8cb63e693f640840ab2dfa79f11d45 /lib/ssh/src/ssh_system_sup.erl
parent1540a0758b8d60af7b3832158015bd8cf64016af (diff)
parent398dcda0815f12fb177bbb3bf68f6b424c2a62f2 (diff)
downloadotp-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_system_sup.erl')
-rw-r--r--lib/ssh/src/ssh_system_sup.erl9
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl
index e70abf59c2..17f990c5d8 100644
--- a/lib/ssh/src/ssh_system_sup.erl
+++ b/lib/ssh/src/ssh_system_sup.erl
@@ -63,9 +63,7 @@ init([Address, Port, Profile, Options]) ->
[#{id => id(ssh_acceptor_sup, Address, Port, Profile),
start => {ssh_acceptor_sup, start_link, [Address, Port, Profile, Options]},
restart => transient,
- shutdown => infinity,
- type => supervisor,
- modules => [ssh_acceptor_sup]
+ type => supervisor
}];
_ ->
[]
@@ -124,9 +122,8 @@ start_subsystem(SystemSup, Role, Address, Port, Profile, Options) ->
#{id => make_ref(),
start => {ssh_subsystem_sup, start_link, [Role, Address, Port, Profile, Options]},
restart => temporary,
- shutdown => infinity,
- type => supervisor,
- modules => [ssh_subsystem_sup]},
+ type => supervisor
+ },
supervisor:start_child(SystemSup, SubsystemSpec).
stop_subsystem(SystemSup, SubSys) ->