*** empty log message ***

SVN Revision: 41

1 files changed, 8 insertions, 15 deletions

diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl
index 5fb03ad2..0c147090 100644
--- a/src/ejabberd_config.erl
+++ b/src/ejabberd_config.erl
@@ -20,23 +20,16 @@ start() ->
 
 
 load_file(File) ->
-    {ok, Bin} = file:read_file(File),
-    Content = binary_to_list(Bin),
-    parse(Content).
-
-
-parse(String) ->
-    case erl_scan:tokens([], String, 0) of
-	{done, Result, Left} ->
-	    {ok, Tokens, _} = Result,
-	    {ok, Term} = erl_parse:parse_term(Tokens),
-	    {Opt, Val} = Term,
-	    ets:insert(ejabberd_config, {Opt, Val}),
-	    parse(Left);
-	_ ->
-	    ok
+    case file:consult(File) of
+	{ok, Terms} ->
+	    lists:foreach(fun({Opt, Val}) ->
+				  ets:insert(ejabberd_config, {Opt, Val})
+			  end, Terms);
+	{error, Reason} ->
+	    exit(file:format_error(Reason))
     end.
 
+
 get_option(Opt) ->
     case ets:lookup(ejabberd_config, Opt) of
 	[{_, Val}] ->