Fix command "update" to return response in the expected format

diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl
index a11b4bf4a4288da208ebac18f5ebbd87164c2614..134bd4465bd57d2d2df8020029b351c4498eaf91 100644 (file)
--- a/src/ejabberd_admin.erl
+++ b/src/ejabberd_admin.erl
@@ -299,14 +299,15 @@ update_list() ->
     [atom_to_list(Beam) || Beam <- UpdatedBeams].
 
 update("all") ->
-    [update_module(ModStr) || ModStr <- update_list()];
+    [update_module(ModStr) || ModStr <- update_list()],
+    {ok, []};
 update(ModStr) ->
     update_module(ModStr).
 
 update_module(ModuleNameString) ->
     ModuleName = list_to_atom(ModuleNameString),
     case ejabberd_update:update([ModuleName]) of
-          {ok, Res} -> {ok, io_lib:format("Updated: ~p", [Res])};
+          {ok, _Res} -> {ok, []};
           {error, Reason} -> {error, Reason}
     end.
 

diff --git a/src/ejabberd_update.erl b/src/ejabberd_update.erl
index f88af2aca4afd7e7bd635506aa99b6b5a8c265b6..6bb35481884e5d2d873eefbd24ce803aefcf4930 100644 (file)
--- a/src/ejabberd_update.erl
+++ b/src/ejabberd_update.erl
@@ -44,7 +44,7 @@ update() ->
                eval_script(
                  LowLevelScript, [],
                  [{ejabberd, "", filename:join(Dir, "..")}]),
-           ?INFO_MSG("eval: ~p~n", [Eval]),
+           ?DEBUG("eval: ~p~n", [Eval]),
            Eval;
        {error, Reason} ->
            {error, Reason}
@@ -61,7 +61,7 @@ update(ModulesToUpdate) ->
                eval_script(
                  LowLevelScript, [],
                  [{ejabberd, "", filename:join(Dir, "..")}]),
-           ?INFO_MSG("eval: ~p~n", [Eval]),
+           ?DEBUG("eval: ~p~n", [Eval]),
            Eval;
        {error, Reason} ->
            {error, Reason}