Remove http supervisors
This commit is contained in:
parent
3bdd5d0d25
commit
8ee5f9fb6f
|
@ -84,8 +84,9 @@
|
||||||
"">>).
|
"">>).
|
||||||
|
|
||||||
start(SockData, Opts) ->
|
start(SockData, Opts) ->
|
||||||
supervisor:start_child(ejabberd_http_sup,
|
{ok,
|
||||||
[SockData, Opts]).
|
proc_lib:spawn(ejabberd_http, init,
|
||||||
|
[SockData, Opts])}.
|
||||||
|
|
||||||
start_link(SockData, Opts) ->
|
start_link(SockData, Opts) ->
|
||||||
{ok,
|
{ok,
|
||||||
|
|
|
@ -152,9 +152,9 @@
|
||||||
|
|
||||||
start(XMPPDomain, Sid, Key, IP, HOpts) ->
|
start(XMPPDomain, Sid, Key, IP, HOpts) ->
|
||||||
?DEBUG("Starting session", []),
|
?DEBUG("Starting session", []),
|
||||||
SupervisorProc = gen_mod:get_module_proc(XMPPDomain, ?PROCNAME_MHB),
|
case catch gen_fsm:start(?MODULE,
|
||||||
case catch supervisor:start_child(SupervisorProc,
|
[Sid, Key, IP, HOpts],
|
||||||
[Sid, Key, IP, HOpts])
|
?FSMOPTS)
|
||||||
of
|
of
|
||||||
{ok, Pid} -> {ok, Pid};
|
{ok, Pid} -> {ok, Pid};
|
||||||
_ -> check_bind_module(XMPPDomain),
|
_ -> check_bind_module(XMPPDomain),
|
||||||
|
|
|
@ -75,7 +75,7 @@
|
||||||
-export_type([ws_socket/0]).
|
-export_type([ws_socket/0]).
|
||||||
|
|
||||||
start(WS) ->
|
start(WS) ->
|
||||||
supervisor:start_child(ejabberd_wsloop_sup, [WS]).
|
gen_fsm:start(?MODULE, [WS], ?FSMOPTS).
|
||||||
|
|
||||||
start_link(WS) ->
|
start_link(WS) ->
|
||||||
gen_fsm:start_link(?MODULE, [WS], ?FSMOPTS).
|
gen_fsm:start_link(?MODULE, [WS], ?FSMOPTS).
|
||||||
|
|
|
@ -121,14 +121,6 @@ init([]) ->
|
||||||
infinity,
|
infinity,
|
||||||
supervisor,
|
supervisor,
|
||||||
[ejabberd_tmp_sup]},
|
[ejabberd_tmp_sup]},
|
||||||
HTTPSupervisor =
|
|
||||||
{ejabberd_http_sup,
|
|
||||||
{ejabberd_tmp_sup, start_link,
|
|
||||||
[ejabberd_http_sup, ejabberd_http]},
|
|
||||||
permanent,
|
|
||||||
infinity,
|
|
||||||
supervisor,
|
|
||||||
[ejabberd_tmp_sup]},
|
|
||||||
FrontendSocketSupervisor =
|
FrontendSocketSupervisor =
|
||||||
{ejabberd_frontend_socket_sup,
|
{ejabberd_frontend_socket_sup,
|
||||||
{ejabberd_tmp_sup, start_link,
|
{ejabberd_tmp_sup, start_link,
|
||||||
|
@ -157,7 +149,6 @@ init([]) ->
|
||||||
S2SInSupervisor,
|
S2SInSupervisor,
|
||||||
S2SOutSupervisor,
|
S2SOutSupervisor,
|
||||||
ServiceSupervisor,
|
ServiceSupervisor,
|
||||||
HTTPSupervisor,
|
|
||||||
IQSupervisor,
|
IQSupervisor,
|
||||||
FrontendSocketSupervisor,
|
FrontendSocketSupervisor,
|
||||||
Listener]}}.
|
Listener]}}.
|
||||||
|
|
|
@ -81,19 +81,11 @@ process(_Path, _Request) ->
|
||||||
%%%----------------------------------------------------------------------
|
%%%----------------------------------------------------------------------
|
||||||
%%% BEHAVIOUR CALLBACKS
|
%%% BEHAVIOUR CALLBACKS
|
||||||
%%%----------------------------------------------------------------------
|
%%%----------------------------------------------------------------------
|
||||||
start(Host, _Opts) ->
|
start(_Host, _Opts) ->
|
||||||
setup_database(),
|
setup_database().
|
||||||
Proc = gen_mod:get_module_proc(Host, ?PROCNAME_MHB),
|
|
||||||
ChildSpec = {Proc,
|
|
||||||
{ejabberd_tmp_sup, start_link,
|
|
||||||
[Proc, ejabberd_http_bind]},
|
|
||||||
permanent, infinity, supervisor, [ejabberd_tmp_sup]},
|
|
||||||
supervisor:start_child(ejabberd_sup, ChildSpec).
|
|
||||||
|
|
||||||
stop(Host) ->
|
stop(_Host) ->
|
||||||
Proc = gen_mod:get_module_proc(Host, ?PROCNAME_MHB),
|
ok.
|
||||||
supervisor:terminate_child(ejabberd_sup, Proc),
|
|
||||||
supervisor:delete_child(ejabberd_sup, Proc).
|
|
||||||
|
|
||||||
setup_database() ->
|
setup_database() ->
|
||||||
migrate_database(),
|
migrate_database(),
|
||||||
|
|
Loading…
Reference in New Issue