Improved subdomain handling with dedicated registry #1116

fenek · 2016-12-12T09:53:06Z

This PR addresses most of #911

Proposed changes include:

New module, mongoose_subhosts, maintains a table of subdomain->domain mappings.
Entries are added when a module registers a subdomain with new API (it is not coupled with route registration or module startup)
API is provided in gen_mod to access module options by subdomain
Main module table is now created with read_concurrency enabled
Clarified naming convention in some places (Host/ServerHost/Server vs. Host/SubHost/MUCHost/etc.)
mod_mam_muc and mod_muc_light use new registry instead of custom, private tables

gadgetci · 2016-12-12T09:54:23Z

test/ejabberd_tests/tests/pubsub_SUITE.erl

@@ -932,5 +932,6 @@ disable_delivery_test(Config) ->
 required_modules() ->
    [{mod_pubsub, [
                   {plugins,[<<"dag">>]},
-                   {nodetree,<<"dag">>}
+                   {nodetree,<<"dag">>},


According to Elvis:

Missing space right "," on line 935

gadgetci · 2016-12-12T09:54:24Z

test/ejabberd_tests/tests/pep_SUITE.erl

@@ -137,7 +137,8 @@ required_modules() ->
     {mod_pubsub, [
                   {plugins,[<<"dag">>,<<"pep">>]},
                   {nodetree,<<"dag">>},


According to Elvis:

Missing space right "," on line 139

gadgetci · 2016-12-12T09:54:25Z

apps/ejabberd/src/mod_muc_light_utils.erl

+    RoomsPerUser = gen_mod:get_module_opt_by_subhost(
+                     MUCServer, mod_muc_light, rooms_per_user, ?DEFAULT_ROOMS_PER_USER),
+    BlockingQuery = case gen_mod:get_module_opt_by_subhost(
+                           MUCServer, mod_muc_light, blocking, ?DEFAULT_BLOCKING) of
                        true ->
                            [{user, FromUS}
                             | if


According to Elvis:

Replace the 'if' expression on line 156 with a 'case' expression or function clauses.

gadgetci · 2016-12-12T09:54:26Z

test/ejabberd_tests/tests/pep_SUITE.erl

@@ -137,7 +137,8 @@ required_modules() ->
     {mod_pubsub, [
                   {plugins,[<<"dag">>,<<"pep">>]},


According to Elvis:

Missing space right "," on line 138

gadgetci · 2016-12-12T09:54:26Z

apps/ejabberd/src/mod_muc.erl

@@ -776,6 +777,8 @@ room_jid_to_pid(#jid{luser=RoomName, lserver=MucService}) ->
        {error, not_found}
    end.

+-spec default_host() -> list().
+default_host() -> "conference.@HOST@".

 -spec iq_disco_info(ejabberd:lang()) -> [jlib:xmlel(),...].


According to Elvis:

Missing space right "," on line 783

gadgetci · 2016-12-12T09:54:27Z

apps/ejabberd/src/mod_vcard.erl

@@ -175,7 +180,7 @@ init([VHost, Opts]) ->
                                  ?MODULE,process_sm_iq, IQDisc),


According to Elvis:

Missing space right "," on line 180

gadgetci · 2016-12-12T09:54:28Z

test/ejabberd_tests/tests/pep_SUITE.erl

@@ -137,7 +137,8 @@ required_modules() ->
     {mod_pubsub, [
                   {plugins,[<<"dag">>,<<"pep">>]},
                   {nodetree,<<"dag">>},
-                   {pep_mapping,[]}
+                   {pep_mapping,[]},


According to Elvis:

Missing space right "," on line 140

gadgetci · 2016-12-12T09:54:29Z

apps/ejabberd/src/mongoose_subhosts.erl

+        [#subhost_mapping{ host = Host }] -> {ok, Host};
+        [] -> undefined
+    end.
+


According to Elvis:

Line 65 has 4 trailing whitespace characters.

gadgetci · 2016-12-12T09:54:29Z

test/ejabberd_tests/tests/pep_SUITE.erl

@@ -137,7 +137,8 @@ required_modules() ->
     {mod_pubsub, [
                   {plugins,[<<"dag">>,<<"pep">>]},


According to Elvis:

Missing space right "," on line 138

gadgetci · 2016-12-12T09:54:30Z

apps/ejabberd/src/mod_vcard.erl

@@ -175,7 +180,7 @@ init([VHost, Opts]) ->
                                  ?MODULE,process_sm_iq, IQDisc),
    gen_iq_handler:add_iq_handler(ejabberd_local, VHost, ?NS_VCARD,
                                  ?MODULE,process_local_iq, IQDisc),


According to Elvis:

Missing space right "," on line 182

gadgetci · 2016-12-12T09:54:31Z

apps/ejabberd/src/mod_vcard_ldap.erl

@@ -461,8 +461,7 @@ process_pattern(Str, {User, Domain}, AttrValues) ->
 			  [{<<"%s">>, V, 1} || V <- AttrValues]).


According to Elvis:

Line 461 has a tab at column 0.

gadgetci · 2016-12-12T09:54:32Z

apps/ejabberd/src/gen_mod.erl

+-spec get_module_opt_subhost(ejabberd:server(), module(), list()) -> ejabberd:server().
+get_module_opt_subhost(Host, Module, Default) ->
+    Subject = get_module_opt(Host, Module, host, Default),
+    re:replace(Subject, "@HOST@", Host, [global, {return,binary}]).


According to Elvis:

Missing space right "," on line 342

gadgetci · 2016-12-12T09:54:33Z

test/ejabberd_tests/tests/pubsub_SUITE.erl

@@ -932,5 +932,6 @@ disable_delivery_test(Config) ->
 required_modules() ->
    [{mod_pubsub, [
                   {plugins,[<<"dag">>]},


According to Elvis:

Missing space right "," on line 934

gadgetci · 2016-12-12T09:54:33Z

apps/ejabberd/src/gen_mod.erl

-spec get_opt_host(ejabberd:server(), list(), _) -> ejabberd:server().
-get_opt_host(Host, Opts, Default) ->
+-spec get_opt_subhost(ejabberd:server(), list(), list()) -> ejabberd:server().
+get_opt_subhost(Host, Opts, Default) ->
    Val = get_opt(host, Opts, Default),
    re:replace(Val, "@HOST@", Host, [global, {return,binary}]).


According to Elvis:

Missing space right "," on line 337

gadgetci · 2016-12-12T09:55:47Z

apps/ejabberd/src/mod_mam_muc.erl

@@ -643,7 +605,7 @@ handle_purge_multiple_messages(ArcJID=#jid{},
 handle_purge_single_message(ArcJID=#jid{},
                            IQ=#iq{sub_el = PurgeEl}) ->
    Now = mod_mam_utils:now_to_microseconds(now()),


According to Compiler:

Warning: erlang:now/0: Deprecated BIF. See the "Time and Time Correction in Erlang" chapter of the ERTS User's Guide for more information.

gadgetci · 2016-12-12T09:55:48Z

apps/ejabberd/src/mod_mam_muc.erl

@@ -482,7 +444,7 @@ handle_lookup_messages(
        ArcJID=#jid{},
        IQ=#iq{xmlns = MamNs, sub_el = QueryEl}) ->
    Now = mod_mam_utils:now_to_microseconds(now()),


According to Compiler:

Warning: erlang:now/0: Deprecated BIF. See the "Time and Time Correction in Erlang" chapter of the ERTS User's Guide for more information.

gadgetci · 2016-12-12T09:55:49Z

apps/ejabberd/src/mod_mam_muc.erl

@@ -537,7 +499,7 @@ handle_set_message_form(
        ArcJID=#jid{},
        IQ=#iq{xmlns=MamNs, sub_el = QueryEl}) ->
    Now = mod_mam_utils:now_to_microseconds(now()),


According to Compiler:

Warning: erlang:now/0: Deprecated BIF. See the "Time and Time Correction in Erlang" chapter of the ERTS User's Guide for more information.

gadgetci · 2016-12-12T09:55:50Z

apps/ejabberd/src/mod_mam_muc.erl

@@ -623,7 +585,7 @@ handle_get_message_form(_From=#jid{}, _ArcJID=#jid{}, IQ=#iq{}) ->
 handle_purge_multiple_messages(ArcJID=#jid{},
                               IQ=#iq{sub_el = PurgeEl}) ->
    Now = mod_mam_utils:now_to_microseconds(now()),


According to Compiler:

Warning: erlang:now/0: Deprecated BIF. See the "Time and Time Correction in Erlang" chapter of the ERTS User's Guide for more information.

fenek · 2016-12-12T10:47:28Z

Resolving now() complaints is not a subject of this PR. :)

michalwski · 2016-12-12T11:53:12Z

apps/ejabberd/src/mod_pubsub.erl

@@ -235,6 +236,10 @@ stop(Host) ->
    ok = supervisor:terminate_child(ejabberd_sup, Proc),
    ok = supervisor:delete_child(ejabberd_sup, Proc).

+-spec default_host() -> string().
+default_host() ->
+    "pubsub.@HOST@".


I see that before the change it was a binary. Why is it changed to plain string now?

In most places it was still provided as string.

It's set with a string in config file.

It doesn't make a difference for re:replace

michalwski · 2016-12-12T11:56:21Z

apps/ejabberd/src/mongoose_subhosts.erl

+         init/0,
+         stop/0,
+
+         'register'/2,


Does compiler complain about function name register without single quotes?

Didn't check. But it's annoying to see it highlighted in editor as BIF anyway. :)

gadgetci reviewed Dec 12, 2016

View reviewed changes

michalwski reviewed Dec 12, 2016

View reviewed changes

fenek added the WIP 🚧 label Dec 12, 2016

fenek force-pushed the improved-subdomain-handling-v2 branch from f4637b9 to 55bef7c Compare December 13, 2016 08:53

fenek added 3 commits December 13, 2016 10:00

Improve subdomain handling with dedicated registry

aa18cab

Revert docs & config changes made by original subhosts branch

d530e02

Style & other minor subhosts fixes

8c8ce77

fenek force-pushed the improved-subdomain-handling-v2 branch from 55bef7c to 8c8ce77 Compare December 13, 2016 09:01

fenek added ready and removed WIP 🚧 labels Dec 13, 2016

michalwski merged commit 42d5e2b into master Dec 13, 2016

michalwski deleted the improved-subdomain-handling-v2 branch December 13, 2016 13:37

This was referenced Jan 20, 2017

MongooseIM 2.0.1 #1160

Merged

MongooseIM 2.0.1 #1164

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improved subdomain handling with dedicated registry #1116

Improved subdomain handling with dedicated registry #1116

fenek commented Dec 12, 2016

gadgetci Dec 12, 2016

gadgetci Dec 12, 2016

gadgetci Dec 12, 2016

gadgetci Dec 12, 2016

gadgetci Dec 12, 2016

gadgetci Dec 12, 2016

gadgetci Dec 12, 2016

gadgetci Dec 12, 2016

gadgetci Dec 12, 2016

gadgetci Dec 12, 2016

gadgetci Dec 12, 2016

gadgetci Dec 12, 2016

gadgetci Dec 12, 2016

gadgetci Dec 12, 2016

gadgetci Dec 12, 2016

gadgetci Dec 12, 2016

gadgetci Dec 12, 2016

gadgetci Dec 12, 2016

fenek commented Dec 12, 2016

michalwski Dec 12, 2016

fenek Dec 12, 2016

michalwski Dec 12, 2016

fenek Dec 12, 2016

		@@ -137,7 +137,8 @@ required_modules() ->
		{mod_pubsub, [
		{plugins,[<<"dag">>,<<"pep">>]},

		@@ -175,7 +180,7 @@ init([VHost, Opts]) ->
		?MODULE,process_sm_iq, IQDisc),

		@@ -461,8 +461,7 @@ process_pattern(Str, {User, Domain}, AttrValues) ->
		[{<<"%s">>, V, 1} \|\| V <- AttrValues]).

Improved subdomain handling with dedicated registry #1116

Improved subdomain handling with dedicated registry #1116

Conversation

fenek commented Dec 12, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fenek commented Dec 12, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment