* 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 ead69d544e47b5815957c4b1dd61277586e2e367..460204a42d3e1734dd8c5f2f8538432cd4e5613b 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 7a9cade1f9b76ba3a8802a7abfc17ca72171517e..c18cfe6de1af006496c70b6f3a012e6481729c98 100644 (file)
--- a/src/ejabberd_config.erl
+++ b/src/ejabberd_config.erl
@@ -96,8 +96,10 @@ get_plain_terms_file(File1) ->
        {ok, Terms} ->
            include_config_files(Terms);
        {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.
 
 %% @doc Convert configuration filename to absolute path.