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

is not flattened (EJAB-616)

SVN Revision: 1424

diff --git a/ChangeLog b/ChangeLog
index ca736396f975c051cb8996364bf394121c538738..4e1453d528f7cbf2eb85df34654110a9cd27fd17 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 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
        RFC 5122 (EJAB-631)
        * doc/guide.html: Likewise

diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl
index 8a76bd7a052a84ad7f6a4878a9b711ab431e3ec7..cce7b814637067cf1e6166923f6ceb3bb20e037e 100644 (file)
--- 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) ->