varia

Author: bartekgorny

big_tests/tests/vcard_SUITE.erl

@@ -32,6 +32,7 @@
 -include_lib("escalus/include/escalus_xmlns.hrl").
 -include_lib("escalus/include/escalus.hrl").
 -include_lib("exml/include/exml.hrl").
+-include_lib("kernel/include/logger.hrl").
 
 %% Element CData
 -define(EL(Element, Name), exml_query:path(Element, [{element, Name}])).
@@ -1128,7 +1129,7 @@ get_jid_record(JID) ->
     jid:make_bare(User, Server).
 
 vcard_rpc(JID, Stanza) ->
-    Acc = rpc(mim(), mongoose_acc, new, [JID, JID, Stanza]),
+    Acc = rpc(mim(), mongoose_acc, new, [JID, JID, Stanza, ?LOCATION]),
     Res = rpc(mim(), mongoose_router, route, [Acc]),
     case Res of
         #{stanza := #{type := <<"set">>}} ->

src/component/mongoose_component_connection.erl

@@ -259,7 +259,7 @@ handle_stream_established(StateData, #xmlel{name = Name} = El) ->
     case IsStanza andalso IsValidFromJid andalso (error =/= ToJid) of
         true ->
             Acc = element_to_origin_accum(StateData, FromJid, ToJid, NewEl),
-            mongoose_router:route(mongoose_acc:update(FromJid, ToJid, NewEl, Acc));
+            mongoose_router:route(Acc);
         false ->
             ?LOG_INFO(#{what => comp_bad_request,
                         text => <<"Not valid Name or error in FromJid or ToJid">>,

src/mod_register.erl

@@ -268,10 +268,10 @@ attempt_cancelation(HostType, #jid{} = ClientJID, #jid{lserver = ServerDomain},
             %% with failure.
             ResIQ = IQ#iq{type = result, sub_el = []},
             mongoose_router:route(
-              mongoose_acc:new(jid:make_noprep(<<>>, <<>>, <<>>),
-              ClientJID,
-              jlib:iq_to_xml(ResIQ),
-              ?LOCATION)),
+                mongoose_acc:new(jid:make_noprep(<<>>, <<>>, <<>>),
+                                 ClientJID,
+                                 jlib:iq_to_xml(ResIQ),
+                                 ?LOCATION)),
             ejabberd_auth:remove_user(ClientJID),
             ignore;
         false ->
@@ -397,7 +397,8 @@ send_welcome_message(HostType, #jid{lserver = Server} = JID) ->
                 mongoose_acc:new(
                     jid:make_noprep(<<>>, Server, <<>>),
                     JID,
-                    #xmlel{name = <<"message">>, attrs = #{<<"type">> => <<"normal">>},
+                    #xmlel{name = <<"message">>,
+                           attrs = #{<<"type">> => <<"normal">>},
                            children = [#xmlel{name = <<"subject">>,
                                               children = [#xmlcdata{content = Subj}]},
                                        #xmlel{name = <<"body">>,

src/mongoose_router.erl

@@ -63,7 +63,12 @@ is_registered_route(LDomain) ->
 
 %% start/stop
 start() ->
-    ets:new(?TABLE, [named_table, public, set, {read_concurrency, true}]),
+    case ets:info(?TABLE) of
+        undefined ->
+            ets:new(?TABLE, [named_table, public, set, {read_concurrency, true}]);
+        _ ->
+            ok
+    end,
     mongoose_component:start(),
     mongoose_instrument:set_up(instrumentation()).