From d8405b694ee52f1bbd91c2b01738d801fa424352 Mon Sep 17 00:00:00 2001 From: Badlop Date: Wed, 9 Jul 2008 16:08:32 +0000 Subject: [PATCH] * src/ejabberd_config.erl (load_file): error message on sasl.log is not flattened (EJAB-616) SVN Revision: 1424 --- ChangeLog | 3 +++ src/ejabberd_config.erl | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca736396f..4e1453d52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-07-09 Badlop + * 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 RFC 5122 (EJAB-631) * doc/guide.html: Likewise diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl index 8a76bd7a0..cce7b8146 100644 --- a/src/ejabberd_config.erl +++ b/src/ejabberd_config.erl @@ -65,8 +65,10 @@ load_file(File) -> Res = lists:foldl(fun process_term/2, State, Terms), set_opts(Res); {error, Reason} -> - ?ERROR_MSG("Can't load config file ~p: ~p", [File, Reason]), - exit(File ++ ": " ++ file:format_error(Reason)) + ExitText = lists:flatten(File ++ ": around line " + ++ file:format_error(Reason)), + ?ERROR_MSG("Problem loading ejabberd config file:~n~s", [ExitText]), + exit(ExitText) end. search_hosts(Term, State) ->