Chapril/xmpp.chapril.org-ejabberd
26
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2025-01-03 18:02:28 +01:00
Code Releases Activity

Remove receiver's supervisor

Browse Source
This commit is contained in:
Christophe Romain 2015-12-09 10:06:57 +01:00
parent 1a32f20c07
commit 3bdd5d0d25
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ejabberd_receiver.erl
View File

@ -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.

9
src/ejabberd_sup.erl
View File

@ -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,