Merge pull request #2937 from esl/load_only/nksip

Tag nksip apps as load-only for relx

Makefile

@@ -13,6 +13,7 @@ all: rel
 clean:
 	-rm -rf asngen
 	-rm -rf _build
+	-rm configure.out
 	-rm rel/configure.vars.config
 	-rm rel/vars.config
 	-rm rel/vars-toml.config

big_tests/tests/dynamic_modules.erl

@@ -67,7 +67,7 @@ start(#{node := Node}, Domain, Mod, Args) ->
     start(Node, Domain, Mod, Args);
 start(Node, Domain, Mod, Args) ->
     Cookie = escalus_ct:get_config(ejabberd_cookie),
-    case escalus_rpc:call(Node, gen_mod, start_module, [Domain, Mod, Args], 5000, Cookie) of
+    case escalus_rpc:call(Node, gen_mod, start_module, [Domain, Mod, Args], 15000, Cookie) of
         {badrpc, Reason} ->
             ct:fail("Cannot start module ~p reason ~p", [Mod, Reason]);
         R -> R

rebar.config.script

@@ -43,17 +43,30 @@ fun() ->
         end
 end,
 
-RequiredApps = fun() -> [mongooseim, inets, tools, compiler] end,
+FirstApps = [kernel, lager],
+RequiredApps = [mongooseim, inets, tools, compiler],
+OptionalApps = [{nksip, [nkservice, nkpacket, nklib]}],
+
 EnvApps = GetEnvApps(),
 
+PrepareApp =
+fun(App) ->
+        case lists:keyfind(App, 1, OptionalApps) of
+            false ->
+                [App];
+            {App, DepsOfApp} ->
+                lists:map(fun(V) -> {V, load} end, [App | DepsOfApp])
+        end
+end,
+
 SetupIncludedApps =
 fun(Config, EnvApps) ->
         RelxCfg = proplists:get_value(relx, Config),
         {release, Desc, _Apps} = lists:keyfind(release, 1, RelxCfg),
         EnvAppsToInclude = [ list_to_atom(App) || App <- string:tokens(EnvApps, " \n\r") ],
-        AppsToIncludeIn = RequiredApps() ++ DevAppsToInclude() ++ EnvAppsToInclude,
-        AppsToInclude = ordsets:to_list(ordsets:from_list(AppsToIncludeIn)),
-        NewReleaseCfg = {release, Desc, AppsToInclude},
+        AppsToIncludeIn = lists:usort(RequiredApps ++ DevAppsToInclude() ++ EnvAppsToInclude),
+        Apps = lists:subtract(AppsToIncludeIn, FirstApps),
+        NewReleaseCfg = {release, Desc, FirstApps ++ lists:flatmap(PrepareApp, Apps)},
         NewRelxCfg = lists:keyreplace(release, 1, RelxCfg, NewReleaseCfg),
         lists:keyreplace(relx, 1, Config, {relx, NewRelxCfg})
 end,

src/jingle_sip/mod_jingle_sip.erl

@@ -57,7 +57,7 @@ start(Host, Opts) ->
     ok.
 
 start_nksip_service_or_error(Opts) ->
-    application:ensure_all_started(nksip),
+    {ok, _} = application:ensure_all_started(nksip),
     ListenPort = gen_mod:get_opt(listen_port, Opts, 5600),
     NkSipBasicOpts = #{sip_listen => "sip:all:" ++ integer_to_list(ListenPort),
                        callback => jingle_sip_callbacks,