aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2008-07-09 16:08:32 +0000
committerBadlop <badlop@process-one.net>2008-07-09 16:08:32 +0000
commite3ba72f3dddcdf00911a4cd40499f3ddd2f27bea (patch)
treeef85b3ed890a221305fb24853ac39aab43a86a28
parent* doc/guide.tex: mod_muc_log XMPP URI supports the updated version (diff)
* src/ejabberd_config.erl (load_file): error message on sasl.log
is not flattened (EJAB-616) SVN Revision: 1424
-rw-r--r--ChangeLog3
-rw-r--r--src/ejabberd_config.erl6
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ead69d544..460204a42 100644
--- 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 7a9cade1f..c18cfe6de 100644
--- 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.