aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>2018-02-11 12:54:15 +0300
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>2018-02-11 12:54:15 +0300
commit66fc1bf3b6cab63559fa58a086a1439ecdebfea7 (patch)
treecdc0ce2d21249f31060a1c302e4708abc507d10e /test
parentBump xmpp version (diff)
Remove 'iqdisc' option
Since we got rid of all bottle-neck processes and we have a connection pool for every database, the option is no longer needed and in fact is detrimental: in practice what you get is just a bunch of overloaded processes in the IQ handlers pool no matter how much you increase the `iqdisc` value. Given that there are close to zero operators understanding the meaning of the option and, hence, not using it all, it's not simply deprecated but completely removed. The commit also deprecates the following functions: - gen_iq_handler:add_iq_handler/6 - gen_iq_handler:handle/5 - gen_iq_handler:iqdisc/1
Diffstat (limited to 'test')
-rw-r--r--test/mod_legacy.erl8
-rw-r--r--test/mod_roster_mock.exs2
2 files changed, 6 insertions, 4 deletions
diff --git a/test/mod_legacy.erl b/test/mod_legacy.erl
index 00fd44040..96c1e041f 100644
--- a/test/mod_legacy.erl
+++ b/test/mod_legacy.erl
@@ -31,10 +31,9 @@
%%%===================================================================
%%% API
%%%===================================================================
-start(Host, Opts) ->
- IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue),
+start(Host, _Opts) ->
gen_iq_handler:add_iq_handler(ejabberd_local, Host, ?NS_EVENT,
- ?MODULE, process_iq, IQDisc).
+ ?MODULE, process_iq).
stop(Host) ->
gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?MODULE).
@@ -45,6 +44,9 @@ mod_opt_type(_) ->
depends(_, _) ->
[].
+mod_options(_) ->
+ [].
+
%%%===================================================================
%%% Internal functions
%%%===================================================================
diff --git a/test/mod_roster_mock.exs b/test/mod_roster_mock.exs
index bdbde2aad..83182c196 100644
--- a/test/mod_roster_mock.exs
+++ b/test/mod_roster_mock.exs
@@ -62,7 +62,7 @@ defmodule ModRosterMock do
roster_mock0 = :moka.start(:mod_roster)
:moka.replace(roster_mock0, :gen_iq_handler, :add_iq_handler,
- fn (_module, _host, _ns, _m, _f, _iqdisc) ->
+ fn (_module, _host, _ns, _m, _f) ->
:ok
end)