diff options
| author | Badlop <badlop@process-one.net> | 2011-12-08 19:39:36 +0100 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2011-12-08 19:39:36 +0100 |
| commit | 37107af7b4c192c01a36aea17403ff4946b892fa (patch) | |
| tree | 9602c167be2d6c060b11a5e7135c2d6a6a82d07b /src | |
| parent | Don't reveal invitee's resource when room informs invitor (diff) | |
Fix command "update" to return response in the expected format
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_admin.erl | 5 | ||||
| -rw-r--r-- | src/ejabberd_update.erl | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl index a11b4bf4a..134bd4465 100644 --- 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 f88af2aca..6bb354818 100644 --- 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} |