diff options
| author | Badlop <badlop@process-one.net> | 2011-12-08 22:39:36 +0400 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2011-12-08 22:40:29 +0400 |
| commit | d5ebef1362dcd7c84bb2af88f6aadc4dd3586570 (patch) | |
| tree | c8bfbf538e3c264f1b652784cf9a88581ada0e06 | |
| parent | 26b814e36723bbd74a1c4c80e14c409ff44a598b (diff) | |
Fix command "update" to return response in the expected format
| -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 2b2bfe44f..4b8fc3958 100644 --- a/src/ejabberd_admin.erl +++ b/src/ejabberd_admin.erl @@ -312,14 +312,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} |