diff options
| author | Christophe Romain <christophe.romain@process-one.net> | 2015-12-09 10:06:57 +0100 |
|---|---|---|
| committer | Christophe Romain <christophe.romain@process-one.net> | 2015-12-11 14:11:44 +0100 |
| commit | 3bdd5d0d2526bb31135c7ab17a43ba3891758137 (patch) | |
| tree | 4116e981e54e03abaf38e212eef3418bb0a85c18 /src | |
| parent | Disable use of multi-subscribe and subscription-option on standard plugins (diff) | |
Remove receiver's supervisor
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_receiver.erl | 5 | ||||
| -rw-r--r-- | src/ejabberd_sup.erl | 9 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/ejabberd_receiver.erl b/src/ejabberd_receiver.erl index 71ae8e409..55ebdbed4 100644 --- a/src/ejabberd_receiver.erl +++ b/src/ejabberd_receiver.erl @@ -76,9 +76,8 @@ start(Socket, SockMod, Shaper) -> non_neg_integer() | infinity) -> undefined | pid(). start(Socket, SockMod, Shaper, MaxStanzaSize) -> - {ok, Pid} = - supervisor:start_child(ejabberd_receiver_sup, - [Socket, SockMod, Shaper, MaxStanzaSize]), + {ok, Pid} = ?GEN_SERVER:start(ejabberd_receiver, + [Socket, SockMod, Shaper, MaxStanzaSize], []), Pid. -spec change_shaper(pid(), shaper:shaper()) -> ok. diff --git a/src/ejabberd_sup.erl b/src/ejabberd_sup.erl index e8d3ce830..e6b30a3d6 100644 --- a/src/ejabberd_sup.erl +++ b/src/ejabberd_sup.erl @@ -97,14 +97,6 @@ init([]) -> infinity, supervisor, [ejabberd_listener]}, - ReceiverSupervisor = - {ejabberd_receiver_sup, - {ejabberd_tmp_sup, start_link, - [ejabberd_receiver_sup, ejabberd_receiver]}, - permanent, - infinity, - supervisor, - [ejabberd_tmp_sup]}, S2SInSupervisor = {ejabberd_s2s_in_sup, {ejabberd_tmp_sup, start_link, @@ -162,7 +154,6 @@ init([]) -> S2S, Local, Captcha, - ReceiverSupervisor, S2SInSupervisor, S2SOutSupervisor, ServiceSupervisor, |