Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-02 16:37:52 +01:00
Code Releases Activity

* src/ejabberd_config.erl (load_file): error message on sasl.log

Browse Source 
is not flattened (EJAB-616)

SVN Revision: 1424
This commit is contained in:
Badlop 2008-07-09 16:08:32 +00:00
parent 95bd9068f7
commit d8405b694e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2008-07-09 Badlop <badlop@process-one.net> 2008-07-09 Badlop <badlop@process-one.net>
* src/ejabberd_config.erl (load_file): error message on sasl.log
is not flattened (EJAB-616)
* doc/guide.tex: mod_muc_log XMPP URI supports the updated version * doc/guide.tex: mod_muc_log XMPP URI supports the updated version
RFC 5122 (EJAB-631) RFC 5122 (EJAB-631)
* doc/guide.html: Likewise * doc/guide.html: Likewise

6
src/ejabberd_config.erl
View File

@ -65,8 +65,10 @@ load_file(File) ->
Res = lists:foldl(fun process_term/2, State, Terms), Res = lists:foldl(fun process_term/2, State, Terms),
set_opts(Res); set_opts(Res);
{error, Reason} -> {error, Reason} ->
?ERROR_MSG("Can't load config file ~p: ~p", [File, Reason]), ExitText = lists:flatten(File ++ ": around line "
exit(File ++ ": " ++ file:format_error(Reason)) ++ file:format_error(Reason)),
?ERROR_MSG("Problem loading ejabberd config file:~n~s", [ExitText]),
exit(ExitText)
end. end.
search_hosts(Term, State) -> search_hosts(Term, State) ->