Merge branch 'lost-pr-1027'

esl · Dec 10, 2018 · 57ab4c6 · 57ab4c6
2 parents a7ea00c + 513b30a
commit 57ab4c6
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 deletions.
diff --git a/big_tests/tests/mam_SUITE.erl b/big_tests/tests/mam_SUITE.erl
@@ -1071,7 +1071,7 @@ stop_module(Host, Mod) ->
     end.
 
 just_stop_module(Host, Mod) ->
-    ok = rpc_apply(gen_mod, stop_module, [Host, Mod]).
+    {ok, _Opts} = rpc_apply(gen_mod, stop_module, [Host, Mod]).
 
 %%--------------------------------------------------------------------
 %% Group name helpers

diff --git a/big_tests/tests/rest_SUITE.erl b/big_tests/tests/rest_SUITE.erl
@@ -470,7 +470,7 @@ stop_start_command_module(_) ->
     %% described above we test both transition from `started' to
     %% `stopped' and from `stopped' to `started'.
     {?OK, _} = gett(admin, <<"/commands">>),
-    ok = dynamic_modules:stop(host(), mod_commands),
+    {ok, _Opts} = dynamic_modules:stop(host(), mod_commands),
     {?NOT_FOUND, _} = gett(admin, <<"/commands">>),
     {ok, _} = dynamic_modules:start(host(), mod_commands, []),
     timer:sleep(200), %% give the server some time to build the paths again

diff --git a/src/gen_mod.erl b/src/gen_mod.erl
@@ -63,6 +63,7 @@
 
          loaded_modules/1,
          loaded_modules_with_opts/1,
+         opts_for_module/2,
          get_module_proc/2,
          is_loaded/2,
          get_deps/3]).
@@ -190,7 +191,7 @@ is_app_running(AppName) ->
 
 %% @doc Stop the module in a host, and forget its configuration.
 -spec stop_module(jid:server(), module()) ->
-    ok | {error, not_loaded} | {error, term()}.
+    {ok, list()} | {error, not_loaded} | {error, term()}.
 stop_module(Host, Module) ->
     case is_loaded(Host, Module) of
         false -> {error, not_loaded};
@@ -199,36 +200,37 @@ stop_module(Host, Module) ->
 
 stop_module_for_host(Host, Module) ->
     case stop_module_keep_config(Host, Module) of
-        ok ->
+        {ok, Opts} ->
             case del_module_mnesia(Host, Module) of
-                {atomic, _} -> ok;
+                {atomic, _} -> {ok, Opts};
                 E -> {error, E}
             end;
-        E ->
-            E
+        {error, E} ->
+            {error, E}
     end.
 
 %% @doc Stop the module in a host, but keep its configuration. As the module
 %% configuration is kept in the Mnesia local_config table, when ejabberd is
 %% restarted the module will be started again. This function is useful when
 %% ejabberd is being stopped and it stops all modules.
--spec stop_module_keep_config(jid:server(), module()) -> {error, term()} | 'ok'.
+-spec stop_module_keep_config(jid:server(), module()) -> {error, term()} | {ok, list()}.
 stop_module_keep_config(Host, Module) ->
+    Opts = opts_for_module(Host, Module),
     case catch Module:stop(Host) of
         {'EXIT', Reason} ->
             ?ERROR_MSG("~p", [Reason]),
             {error, Reason};
         {wait, ProcList} when is_list(ProcList) ->
             lists:foreach(fun wait_for_process/1, ProcList),
             ets:delete(ejabberd_modules, {Module, Host}),
-            ok;
+            {ok, Opts};
         {wait, Process} ->
             wait_for_process(Process),
             ets:delete(ejabberd_modules, {Module, Host}),
-            ok;
+            {ok, Opts};
         _ ->
             ets:delete(ejabberd_modules, {Module, Host}),
-            ok
+            {ok, Opts}
     end.
 
 -spec reload_module(jid:server(), module(), [any()]) -> {ok, term()} | {error, already_started}.
@@ -385,6 +387,17 @@ loaded_modules_with_opts(Host) ->
                  [],
                  [{{'$1', '$2'}}]}]).
 
+-spec opts_for_module(ejabberd:server(), module()) -> list().
+opts_for_module(Host, Module) ->
+    case ets:select(ejabberd_modules,
+                    [{#ejabberd_module{_ = '_',
+                                       module_host = {Module, Host},
+                                       opts = '$1'},
+                      [],
+                      [{{'$1'}}]}]) of
+        [{Opts}] -> Opts;
+        []       -> []
+    end.
 
 -spec set_module_opts_mnesia(jid:server(), module(), [any()]
                             ) -> {'aborted', _} | {'atomic', _}.
@@ -441,7 +454,6 @@ clear_opts(Module, Opts0) ->
             Opts
     end.
 
-
 -spec get_deps(Host :: jid:server(), Module :: module(),
                Opts :: proplists:proplist()) -> deps_list().
 get_deps(Host, Module, Opts) ->

diff --git a/test/gen_mod_SUITE.erl b/test/gen_mod_SUITE.erl
@@ -51,8 +51,8 @@ start_and_stop(_Config) ->
     {ok, _} = gen_mod:start_module(host(b), a_module, []),
     {error, already_started} = gen_mod:start_module(host(a), a_module, []),
     {error, already_started} = gen_mod:start_module(host(b), a_module, []),
-    ok = gen_mod:stop_module(host(a), a_module),
-    ok = gen_mod:stop_module(host(b), a_module),
+    {ok, []} = gen_mod:stop_module(host(a), a_module),
+    {ok, []} = gen_mod:stop_module(host(b), a_module),
     {error, not_loaded} = gen_mod:stop_module(host(a), a_module),
     {error, not_loaded} = gen_mod:stop_module(host(b), a_module),
     ok.