Chapril/xmpp.chapril.org-ejabberd
26
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2025-01-01 17:53:00 +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 70d2682c6a
commit e3ba72f3dd
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

@ -96,8 +96,10 @@ get_plain_terms_file(File1) ->
{ok, Terms} -> {ok, Terms} ->
include_config_files(Terms); include_config_files(Terms);
{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.
%% @doc Convert configuration filename to absolute path. %% @doc Convert configuration filename to absolute path.