ssh: Dont repeat supervisor defaults in map fields

9 files changed, 19 insertions, 37 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) ->
diff --git a/lib/ssh/src/ssh_channel_sup.erl b/lib/ssh/src/ssh_channel_sup.erl
index deb0116958..8444533fd1 100644
--- a/lib/ssh/src/ssh_channel_sup.erl
+++ b/lib/ssh/src/ssh_channel_sup.erl
@@ -42,7 +42,6 @@ start_child(Sup, Callback, Id, Args, Exec) ->
         #{id       => make_ref(),
           start    => {ssh_channel, start_link, [self(), Id, Callback, Args, Exec]},
           restart  => temporary,
-          shutdown => 3600,
           type     => worker,
           modules  => [ssh_channel]
          },
diff --git a/lib/ssh/src/ssh_connection_sup.erl b/lib/ssh/src/ssh_connection_sup.erl
index 60ee8b7c73..2e8450090a 100644
--- a/lib/ssh/src/ssh_connection_sup.erl
+++ b/lib/ssh/src/ssh_connection_sup.erl
@@ -52,10 +52,7 @@ init(_) ->
                 },
     ChildSpecs = [#{id       => undefined, % As simple_one_for_one is used.
                     start    => {ssh_connection_handler, start_link, []},
-                    restart  => temporary,
-                    shutdown => 4000,
-                    type     => worker,
-                    modules  => [ssh_connection_handler]
+                    restart  => temporary % because there is no way to restart a crashed connection
                    }
                  ],
     {ok, {SupFlags,ChildSpecs}}.
diff --git a/lib/ssh/src/ssh_subsystem_sup.erl b/lib/ssh/src/ssh_subsystem_sup.erl
index 8db051095c..77da240a66 100644
--- a/lib/ssh/src/ssh_subsystem_sup.erl
+++ b/lib/ssh/src/ssh_subsystem_sup.erl
@@ -74,18 +74,14 @@ ssh_connection_child_spec(Role, Address, Port, _Profile, Options) ->
     #{id       => id(Role, ssh_connection_sup, Address, Port),
       start    => {ssh_connection_sup, start_link, [Options]},
       restart  => temporary,
-      shutdown => 5000,
-      type     => supervisor,
-      modules  => [ssh_connection_sup]
+      type     => supervisor
      }.
 
 ssh_channel_child_spec(Role, Address, Port, _Profile, Options) ->
     #{id       => id(Role, ssh_channel_sup, Address, Port),
       start    => {ssh_channel_sup, start_link, [Options]},
       restart  => temporary,
-      shutdown => infinity,
-      type     => supervisor,
-      modules  => [ssh_channel_sup]
+      type     => supervisor
      }.
 
 id(Role, Sup, Address, Port) ->
diff --git a/lib/ssh/src/ssh_sup.erl b/lib/ssh/src/ssh_sup.erl
index eaec7a54e4..8183016ba5 100644
--- a/lib/ssh/src/ssh_sup.erl
+++ b/lib/ssh/src/ssh_sup.erl
@@ -36,15 +36,14 @@ init(_) ->
                  intensity =>   10,
                  period    => 3600
                 },
-    ChildSpecs = [#{id       => Module,
-                    start    => {Module, start_link, []},
-                    restart  => permanent,
-                    shutdown => 4000, %brutal_kill,
-                    type     => supervisor,
-                    modules  => [Module]
+    ChildSpecs = [#{id       => sshd_sup,
+                    start    => {sshd_sup, start_link, []},
+                    type     => supervisor
+                   },
+                  #{id       => sshc_sup,
+                    start    => {sshc_sup, start_link, []},
+                    type     => supervisor
                    }
-                  || Module <- [sshd_sup,
-                                sshc_sup]
                  ],
     {ok, {SupFlags,ChildSpecs}}.
 
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) ->
diff --git a/lib/ssh/src/sshc_sup.erl b/lib/ssh/src/sshc_sup.erl
index 133b2c6450..fd4d8a3c07 100644
--- a/lib/ssh/src/sshc_sup.erl
+++ b/lib/ssh/src/sshc_sup.erl
@@ -60,10 +60,7 @@ init(_) ->
                 },
     ChildSpecs = [#{id       => undefined, % As simple_one_for_one is used.
                     start    => {ssh_connection_handler, start_link, []},
-                    restart  => temporary,
-                    shutdown => 4000,
-                    type     => worker,
-                    modules  => [ssh_connection_handler]
+                    restart  => temporary % because there is no way to restart a crashed connection
                    }
                  ],
     {ok, {SupFlags,ChildSpecs}}.
diff --git a/lib/ssh/src/sshd_sup.erl b/lib/ssh/src/sshd_sup.erl
index c23e65d955..779a861a54 100644
--- a/lib/ssh/src/sshd_sup.erl
+++ b/lib/ssh/src/sshd_sup.erl
@@ -90,10 +90,8 @@ init(_) ->
 child_spec(Address, Port, Profile, Options) ->
     #{id       => id(Address, Port, Profile),
       start    => {ssh_system_sup, start_link, [Address, Port, Profile, Options]},
-      restart  => temporary,
-      shutdown => infinity,
-      type     => supervisor,
-      modules  => [ssh_system_sup]
+      restart  => temporary, 
+      type     => supervisor
      }.
 
 id(Address, Port, Profile) ->
diff --git a/lib/ssh/test/ssh_options_SUITE.erl b/lib/ssh/test/ssh_options_SUITE.erl
index 144ec7f8fd..e1357c3a18 100644
--- a/lib/ssh/test/ssh_options_SUITE.erl
+++ b/lib/ssh/test/ssh_options_SUITE.erl
@@ -219,7 +219,9 @@ end_per_testcase(_TestCase, Config) ->
     end_per_testcase(Config).
 
 end_per_testcase(_Config) ->    
+    ct:log("~p: Before ssh:stop()",[?FUNCTION_NAME]),
     ssh:stop(),
+    ct:log("~p: After ssh:stop()",[?FUNCTION_NAME]),
     ok.
 
 %%--------------------------------------------------------------------