aboutsummaryrefslogtreecommitdiff
path: root/src/ejabberd_app.erl
diff options
context:
space:
mode:
Diffstat (limited to 'src/ejabberd_app.erl')
-rw-r--r--src/ejabberd_app.erl17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl
index 30f34aff4..e493eac01 100644
--- a/src/ejabberd_app.erl
+++ b/src/ejabberd_app.erl
@@ -5,7 +5,7 @@
%%% Created : 31 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2015 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
@@ -43,6 +43,7 @@
start(normal, _Args) ->
ejabberd_logger:start(),
write_pid_file(),
+ jid:start(),
start_apps(),
ejabberd:check_app(ejabberd),
randoms:start(),
@@ -53,6 +54,7 @@ start(normal, _Args) ->
ejabberd_commands:init(),
ejabberd_admin:start(),
gen_mod:start(),
+ ext_mod:start(),
ejabberd_config:start(),
set_settings_from_config(),
acl:start(),
@@ -67,8 +69,8 @@ start(normal, _Args) ->
%ejabberd_debug:eprof_start(),
%ejabberd_debug:fprof_start(),
maybe_add_nameservers(),
- ext_mod:start(),
ejabberd_auth:start(),
+ ejabberd_oauth:start(),
start_modules(),
ejabberd_listener:start_listeners(),
?INFO_MSG("ejabberd ~s is started in the node ~p", [?VERSION, node()]),
@@ -250,12 +252,11 @@ start_apps() ->
crypto:start(),
ejabberd:start_app(sasl),
ejabberd:start_app(ssl),
- ejabberd:start_app(p1_yaml),
- ejabberd:start_app(p1_tls),
- ejabberd:start_app(p1_xml),
- ejabberd:start_app(p1_stringprep),
- ejabberd:start_app(p1_zlib),
- ejabberd:start_app(p1_cache_tab).
+ ejabberd:start_app(fast_yaml),
+ ejabberd:start_app(fast_tls),
+ ejabberd:start_app(fast_xml),
+ ejabberd:start_app(stringprep),
+ ejabberd:start_app(cache_tab).
opt_type(net_ticktime) ->
fun (P) when is_integer(P), P > 0 -> P end;