Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

C2s/ejabberd c2s sup #3860

Merged
merged 1 commit into from
Nov 17, 2022
Merged

C2s/ejabberd c2s sup #3860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion big_tests/tests/last_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ init_per_group(valid_queries, Config0) ->
%% This check uses ejabberd_sm to get information about sessions.
escalus_ejabberd:wait_for_session_count(Config2, 0),
%% Kick "friendly" users
%% kick_everyone uses ejabberd_c2s_sup to information about client processes.
%% kick_everyone uses mongoose_c2s_sup to information about client processes.
mongoose_helper:kick_everyone(),
Config2;
init_per_group(invalid_queries, Config) ->
Expand Down
35 changes: 13 additions & 22 deletions test/mongooseim_metrics_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,28 +36,19 @@ init_per_suite(C) ->
application:set_env(exometer_core, mongooseim_report_interval, 1000),
{Port, Socket} = carbon_cache_server:start(),
Sup = spawn(fun() ->
mim_ct_sup:start_link(ejabberd_sup),
Hooks =
{gen_hook,
{gen_hook, start_link, []},
permanent,
brutal_kill,
worker,
[gen_hook]},
C2SSupervisor =
{ejabberd_c2s_sup,
{ejabberd_tmp_sup, start_link, [ejabberd_c2s_sup, ejabberd_c2s]},
permanent,
infinity,
supervisor,
[ejabberd_tmp_sup]},
supervisor:start_child(ejabberd_sup, Hooks),
supervisor:start_child(ejabberd_sup, C2SSupervisor),
receive
stop ->
ok
end
end),
mim_ct_sup:start_link(ejabberd_sup),
Hooks = {gen_hook,
{gen_hook, start_link, []},
permanent,
brutal_kill,
worker,
[gen_hook]},
supervisor:start_child(ejabberd_sup, Hooks),
receive
stop ->
ok
end
end),
Reporters = get_reporters_cfg(Port),
application:set_env(exometer_core, report, Reporters),
PortServer = carbon_cache_server:wait_for_accepting(),
Expand Down