diff options
author | Christophe Romain <christophe.romain@process-one.net> | 2015-11-04 18:24:35 +0300 |
---|---|---|
committer | Christophe Romain <christophe.romain@process-one.net> | 2015-11-04 18:24:35 +0300 |
commit | 341be9b6820d2d2ee0113dce3f66b0d6571fd95f (patch) | |
tree | debe59f56f02704a81bdf5b9a99e5c9b43832946 /src/ejabberd_c2s.erl | |
parent | fec7e47169142d428cb6f779552b6bf2e1dea91b (diff) |
Remove supervisor option, disable it for c2s and muc
Diffstat (limited to 'src/ejabberd_c2s.erl')
-rw-r--r-- | src/ejabberd_c2s.erl | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 69b465238..57cf50641 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -129,15 +129,6 @@ -endif. -%% Module start with or without supervisor: --ifdef(NO_TRANSIENT_SUPERVISORS). --define(SUPERVISOR_START, ?GEN_FSM:start(ejabberd_c2s, [SockData, Opts], - fsm_limit_opts(Opts) ++ ?FSMOPTS)). --else. --define(SUPERVISOR_START, supervisor:start_child(ejabberd_c2s_sup, - [SockData, Opts])). --endif. - %% This is the timeout to apply between event when starting a new %% session: -define(C2S_OPEN_TIMEOUT, 60000). @@ -201,7 +192,9 @@ %%% API %%%---------------------------------------------------------------------- start(SockData, Opts) -> - ?SUPERVISOR_START. + ?GEN_FSM:start(ejabberd_c2s, + [SockData, Opts], + fsm_limit_opts(Opts) ++ ?FSMOPTS). start_link(SockData, Opts) -> (?GEN_FSM):start_link(ejabberd_c2s, |