From: Paweł Chmielowski <pchmielowski@process-one.net>
Date: Wed, 9 Jan 2019 17:14:50 +0000 (+0100)
Subject: Use OTP application startup infrastructure for starting dependencies
X-Git-Tag: 19.02~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d47bc1efdb15fbf0b223db9e543b451c93923929;p=ejabberd

Use OTP application startup infrastructure for starting dependencies
---

diff --git a/src/ejabberd.app.src.in b/src/ejabberd.app.src.in
index 407fc68e1..ea3a7894d 100644
--- a/src/ejabberd.app.src.in
+++ b/src/ejabberd.app.src.in
@@ -5,7 +5,7 @@
   {vsn, "@PACKAGE_VERSION@"},
   {modules, []},
   {registered, []},
-  {applications, [kernel, stdlib]},
+  {applications, [kernel, stdlib, crypto, sasl, ssl, p1_utils, fast_yaml, fast_tls, pkix, xmpp, cache_tab, eimp]},
   {env, [{enabled_backends, [@enabled_backends@]}]},
   {mod, {ejabberd_app, []}}]}.
 
diff --git a/src/ejabberd.erl b/src/ejabberd.erl
index 9992d7392..a8ea2ddc2 100644
--- a/src/ejabberd.erl
+++ b/src/ejabberd.erl
@@ -44,7 +44,8 @@
 
 start() ->
     %%ejabberd_cover:start(),
-    application:start(ejabberd).
+    ejabberd_logger:start(),
+    application:ensure_all_started(ejabberd).
 
 stop() ->
     application:stop(ejabberd).
diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl
index 20e9a7df7..4f33618a4 100644
--- a/src/ejabberd_app.erl
+++ b/src/ejabberd_app.erl
@@ -39,9 +39,7 @@
 
 start(normal, _Args) ->
     {T1, _} = statistics(wall_clock),
-    ejabberd_logger:start(),
     write_pid_file(),
-    start_apps(),
     start_elixir_application(),
     ejabberd:check_app(ejabberd),
     setup_if_elixir_conf_used(),
@@ -148,18 +146,6 @@ file_queue_init() ->
 	       end,
     p1_queue:start(QueueDir).
 
-start_apps() ->
-    crypto:start(),
-    ejabberd:start_app(sasl),
-    ejabberd:start_app(ssl),
-    ejabberd:start_app(p1_utils),
-    ejabberd:start_app(fast_yaml),
-    ejabberd:start_app(fast_tls),
-    ejabberd:start_app(pkix),
-    ejabberd:start_app(xmpp),
-    ejabberd:start_app(cache_tab),
-    ejabberd:start_app(eimp).
-
 setup_if_elixir_conf_used() ->
   case ejabberd_config:is_using_elixir_config() of
     true -> 'Elixir.Ejabberd.Config.Store':start_link();