* src/ejabberd_config.erl: If syntax mistake in config file, show

specific error message (EJAB-616)

SVN Revision: 1470

diff --git a/ChangeLog b/ChangeLog
index 97d735f00023690184eee05ed5afb279a77d8b51..be5f8c044ee69c8a1090871d52b1bc137e65f640 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-22  Badlop  <badlop@process-one.net>
+
+       * src/ejabberd_config.erl: If syntax mistake in config file, show
+       specific error message (EJAB-616)
+
 2008-07-22  Alexey Shchepin  <alexey@process-one.net>
 
        * src/odbc/odbc_queries.erl: Fixed a typo

diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl
index c18cfe6de1af006496c70b6f3a012e6481729c98..1cd9c671da6a9e55649892970b308e7617656a02 100644 (file)
--- a/src/ejabberd_config.erl
+++ b/src/ejabberd_config.erl
@@ -95,10 +95,14 @@ get_plain_terms_file(File1) ->
     case file:consult(File) of
        {ok, Terms} ->
            include_config_files(Terms);
-       {error, Reason} ->
-           ExitText = lists:flatten(File ++ ": around line "
+       {error, {_LineNumber, erl_parse, _ParseMessage} = Reason} ->
+           ExitText = lists:flatten(File ++ " approximately in the line "
                                     ++ file:format_error(Reason)),
-           ?ERROR_MSG("Problem loading ejabberd config file:~n~s", [ExitText]),
+           ?ERROR_MSG("Problem loading ejabberd config file ~n~s", [ExitText]),
+           exit(ExitText);
+       {error, Reason} ->
+           ExitText = lists:flatten(File ++ ": " ++ file:format_error(Reason)),
+           ?ERROR_MSG("Problem loading ejabberd config file ~n~s", [ExitText]),
            exit(ExitText)
     end.