25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-10-07 14:58:56 +02:00

Move some apps back to included_applications

This commit is contained in:
Paweł Chmielowski 2019-01-16 15:01:32 +01:00
parent 3f2265d457
commit a30bfefb98
4 changed files with 19 additions and 9 deletions

View File

@ -25,10 +25,11 @@ defmodule Ejabberd.Mixfile do
def application do
[mod: {:ejabberd_app, []},
applications: [:ssl, :os_mon, :lager, :mnesia, :inets, :p1_utils, :cache_tab,
:fast_tls, :stringprep, :fast_xml, :xmpp,
:stun, :fast_yaml, :esip, :jiffy, :p1_oauth2,
:eimp, :base64url, :jose, :pkix]
applications: [:kernel, :stdlib, :sasl, :ssl],
included_applications: [:lager, :mnesia, :inets, :p1_utils, :cache_tab,
:fast_tls, :stringprep, :fast_xml, :xmpp,
:stun, :fast_yaml, :esip, :jiffy, :p1_oauth2,
:eimp, :base64url, :jose, :pkix]
++ cond_apps()]
end

View File

@ -5,7 +5,8 @@
{vsn, "@PACKAGE_VERSION@"},
{modules, []},
{registered, []},
{applications, [kernel, stdlib, crypto, sasl, ssl, p1_utils, fast_yaml, fast_tls, pkix, xmpp, cache_tab, eimp]},
{applications, [kernel, stdlib, sasl, ssl]},
{included_applications, [lager, mnesia, inets, p1_utils, fast_yaml, fast_tls, pkix, xmpp, cache_tab, eimp]},
{env, [{enabled_backends, [@enabled_backends@]}]},
{mod, {ejabberd_app, []}}]}.

View File

@ -43,14 +43,10 @@
-include("logger.hrl").
start() ->
%%ejabberd_cover:start(),
ejabberd_logger:start(),
ejabberd_mnesia:start(),
application:ensure_all_started(ejabberd).
stop() ->
application:stop(ejabberd).
%%ejabberd_cover:stop().
halt() ->
application:stop(lager),

View File

@ -41,6 +41,7 @@ start(normal, _Args) ->
{T1, _} = statistics(wall_clock),
ejabberd_logger:start(),
write_pid_file(),
start_included_apps(),
start_elixir_application(),
ejabberd:check_app(ejabberd),
setup_if_elixir_conf_used(),
@ -72,6 +73,17 @@ start(normal, _Args) ->
start(_, _) ->
{error, badarg}.
start_included_apps() ->
{ok, Apps} = application:get_key(ejabberd, included_applications),
lists:foreach(
fun(mnesia) ->
ok;
(lager)->
ok;
(App) ->
application:ensure_all_started(App)
end, Apps).
%% Prepare the application for termination.
%% This function is called when an application is about to be stopped,
%% before shutting down the processes of the application.