diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-01-20 19:35:46 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-01-20 19:35:46 +0300 |
| commit | d5d906184f41232e8ab0b4de1308bfa49a783a61 (patch) | |
| tree | b589bba220001a7cf356a7e8fbf4ccb59480508c /src/ejabberd_app.erl | |
| parent | Prepare 17.01 for hex.pm (diff) | |
| parent | Fix reporting dialback failures (diff) | |
Merge branch 'new_stream'
Conflicts:
src/cyrsasl.erl
src/ejabberd_c2s.erl
src/ejabberd_cluster.erl
src/ejabberd_frontend_socket.erl
src/ejabberd_node_groups.erl
src/ejabberd_router.erl
src/mod_bosh.erl
src/mod_ip_blacklist.erl
src/mod_muc_mnesia.erl
src/mod_offline.erl
src/mod_proxy65_sm.erl
Diffstat (limited to 'src/ejabberd_app.erl')
| -rw-r--r-- | src/ejabberd_app.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl index 98f664008..493600afc 100644 --- a/src/ejabberd_app.erl +++ b/src/ejabberd_app.erl @@ -54,8 +54,6 @@ start(normal, _Args) -> ejabberd_ctl:init(), ejabberd_commands:init(), ejabberd_admin:start(), - gen_mod:start(), - ext_mod:start(), setup_if_elixir_conf_used(), ejabberd_config:start(), set_settings_from_config(), @@ -66,11 +64,13 @@ start(normal, _Args) -> ejabberd_rdbms:start(), ejabberd_riak_sup:start(), ejabberd_redis:start(), + ejabberd_router:start(), + ejabberd_router_multicast:start(), + ejabberd_local:start(), ejabberd_sm:start(), cyrsasl:start(), - % Profiling - %ejabberd_debug:eprof_start(), - %ejabberd_debug:fprof_start(), + gen_mod:start(), + ext_mod:start(), maybe_add_nameservers(), ejabberd_auth:start(), ejabberd_oauth:start(), @@ -169,7 +169,7 @@ broadcast_c2s_shutdown() -> Children = ejabberd_sm:get_all_pids(), lists:foreach( fun(C2SPid) when node(C2SPid) == node() -> - C2SPid ! system_shutdown; + ejabberd_c2s:send(C2SPid, xmpp:serr_system_shutdown()); (_) -> ok end, Children). |