1 files changed, 27 insertions, 67 deletions
diff --git a/lib/ssh/src/ssh_sup.erl b/lib/ssh/src/ssh_sup.erl
index 6d2b9c107d..eaec7a54e4 100644
--- a/lib/ssh/src/ssh_sup.erl
+++ b/lib/ssh/src/ssh_sup.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
 %%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
 %%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %%
 %% %CopyrightEnd%
 %%
@@ -30,61 +31,20 @@
 %%%=========================================================================
 %%%  Supervisor callback
 %%%=========================================================================
-init([]) ->
-    SupFlags = {one_for_one, 10, 3600},
-    Children = children(), 
-    {ok, {SupFlags, Children}}.
-
-%%%=========================================================================
-%%%  Internal functions
-%%%=========================================================================
-get_services() ->
-    case (catch application:get_env(ssh, services)) of
-	{ok, Services} ->
-	    Services;
-	_ ->
-	    []
-    end. 
-
-children() ->
-    Services = get_services(),
-    Clients = [Service || Service <- Services, is_client(Service)],
-    Servers =  [Service || Service <- Services, is_server(Service)],
-
-    [server_child_spec(Servers), client_child_spec(Clients)].
-
-server_child_spec(Servers) ->
-    Name = sshd_sup,
-    StartFunc = {sshd_sup, start_link, [Servers]},
-    Restart = permanent, 
-    Shutdown = infinity,
-    Modules = [sshd_sup],
-    Type = supervisor,
-    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
-
-client_child_spec(Clients) ->
-    Name = sshc_sup,
-    StartFunc = {sshc_sup, start_link, [Clients]},
-    Restart = permanent, 
-    Shutdown = infinity,
-    Modules = [sshc_sup],
-    Type = supervisor,
-    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
-
-is_server({sftpd, _}) ->
-    true;
-is_server({shelld, _}) ->
-    true;
-is_server(_) ->
-    false.
-
-is_client({sftpc, _}) ->
-    true;
-is_client({shellc, _}) ->
-    true;
-is_client(_) ->
-    false.
-
-
-
+init(_) ->
+    SupFlags = #{strategy  => one_for_one, 
+                 intensity =>   10,
+                 period    => 3600
+                },
+    ChildSpecs = [#{id       => Module,
+                    start    => {Module, start_link, []},
+                    restart  => permanent,
+                    shutdown => 4000, %brutal_kill,
+                    type     => supervisor,
+                    modules  => [Module]
+                   }
+                  || Module <- [sshd_sup,
+                                sshc_sup]
+                 ],
+    {ok, {SupFlags,ChildSpecs}}.