diff options
| author | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-06-14 12:33:26 +0300 |
|---|---|---|
| committer | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-06-14 12:33:26 +0300 |
| commit | a02cff0e780bb735531594c4ece81e8628f79782 (patch) | |
| tree | 6fe7d8219d14f58183be1741fcea262c216db447 /src/ejabberd_sup.erl | |
| parent | Return jid_malformed error when sending presence without nick to conference (diff) | |
Use new configuration validator
Diffstat (limited to 'src/ejabberd_sup.erl')
| -rw-r--r-- | src/ejabberd_sup.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ejabberd_sup.erl b/src/ejabberd_sup.erl index edf15e438..1868a85ce 100644 --- a/src/ejabberd_sup.erl +++ b/src/ejabberd_sup.erl @@ -30,7 +30,7 @@ -export([start_link/0, init/1]). --define(SHUTDOWN_TIMEOUT, timer:seconds(30)). +-define(SHUTDOWN_TIMEOUT, timer:minutes(1)). start_link() -> supervisor:start_link({local, ?MODULE}, ?MODULE, []). @@ -53,10 +53,9 @@ init([]) -> simple_supervisor(ejabberd_service), worker(acl), worker(ejabberd_shaper), + supervisor(ejabberd_db_sup), supervisor(ejabberd_backend_sup), supervisor(ejabberd_rdbms), - supervisor(ejabberd_riak_sup), - supervisor(ejabberd_redis_sup), worker(ejabberd_iq), worker(ejabberd_router), worker(ejabberd_router_multicast), |