Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-02 21:17:12 +02:00
Code Releases Activity

Catch errors when exporting to PIEFXIS file (EJAB-1178)

Browse Source
This commit is contained in:
Badlop 2010-02-22 21:37:41 +01:00
parent e4f19df428
commit f36ac2b809
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ejabberd_piefxis.erl
View File

@ -468,6 +468,7 @@ export_host(Dir, FnH, Host) ->
Users = ejabberd_auth:get_vh_registered_users(Host), Users = ejabberd_auth:get_vh_registered_users(Host),
[export_user(Fd, Username, Host) || {Username, _Host} <- Users], [export_user(Fd, Username, Host) || {Username, _Host} <- Users],
timer:sleep(500), % Delay to ensure ERROR_MSG are displayed in the shell
print(Fd, make_piefxis_host_tail()), print(Fd, make_piefxis_host_tail()),
print(Fd, make_piefxis_xml_tail()), print(Fd, make_piefxis_xml_tail()),
@ -516,8 +517,14 @@ make_xinclude(Fn) ->
%% @spec (Fd, Username::string(), Host::string()) -> ok %% @spec (Fd, Username::string(), Host::string()) -> ok
%% @doc Extract user information and print it. %% @doc Extract user information and print it.
export_user(Fd, Username, Host) -> export_user(Fd, Username, Host) ->
UserString = extract_user(Username, Host), try extract_user(Username, Host) of
print(Fd, UserString). UserString ->
print(Fd, UserString)
catch
E1:E2 ->
?ERROR_MSG("The account ~s@~s is not exported because a problem "
"was found in it:~n~p: ~p", [Username, Host, E1, E2])
end.
%% @spec (Username::string(), Host::string()) -> string() %% @spec (Username::string(), Host::string()) -> string()
extract_user(Username, Host) -> extract_user(Username, Host) ->