diff options
| author | Paweł Chmielowski <pchmielowski@process-one.net> | 2019-01-09 18:14:50 +0100 |
|---|---|---|
| committer | Paweł Chmielowski <pchmielowski@process-one.net> | 2019-01-09 18:14:50 +0100 |
| commit | d47bc1efdb15fbf0b223db9e543b451c93923929 (patch) | |
| tree | 1faa3fc42170dec988f3a06c944576ae182c4615 /src | |
| parent | Merge pull request #2680 from Iperity/fix-privacy-check-on-presence-probe (diff) | |
Use OTP application startup infrastructure for starting dependencies
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd.app.src.in | 2 | ||||
| -rw-r--r-- | src/ejabberd.erl | 3 | ||||
| -rw-r--r-- | src/ejabberd_app.erl | 14 |
3 files changed, 3 insertions, 16 deletions
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(); |