Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-26 17:38:45 +01:00
Code Releases Activity

Don't halt program when include_config_file is missing/can't be read

Browse Source
This commit is contained in:
Paweł Chmielowski 2016-01-29 14:49:27 +01:00 committed by Christophe Romain
parent 47050db6b8
commit 53e1100cc4
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/ejabberd_config.erl
View File

@ -227,6 +227,7 @@ get_plain_terms_file(File, Opts) when is_binary(File) ->
get_plain_terms_file(binary_to_list(File), Opts); get_plain_terms_file(binary_to_list(File), Opts);
get_plain_terms_file(File1, Opts) -> get_plain_terms_file(File1, Opts) ->
File = get_absolute_path(File1), File = get_absolute_path(File1),
DontStopOnError = lists:member(dont_halt_on_error, Opts),
case consult(File) of case consult(File) of
{ok, Terms} -> {ok, Terms} ->
BinTerms1 = strings_to_binary(Terms), BinTerms1 = strings_to_binary(Terms),
@ -246,9 +247,21 @@ get_plain_terms_file(File1, Opts) ->
false -> false ->
BinTerms BinTerms
end; end;
{error, Reason} -> {error, enoent, Reason} ->
case DontStopOnError of
true ->
?WARNING_MSG(Reason, []),
[];
_ ->
?ERROR_MSG(Reason, []), ?ERROR_MSG(Reason, []),
exit_or_halt(Reason) exit_or_halt(Reason)
end;
{error, Reason} ->
?ERROR_MSG(Reason, []),
case DontStopOnError of
true -> [];
_ -> exit_or_halt(Reason)
end
end. end.
consult(File) -> consult(File) ->
@ -262,17 +275,29 @@ consult(File) ->
{error, Err} -> {error, Err} ->
Msg1 = "Cannot load " ++ File ++ ": ", Msg1 = "Cannot load " ++ File ++ ": ",
Msg2 = fast_yaml:format_error(Err), Msg2 = fast_yaml:format_error(Err),
case Err of
enoent ->
{error, enoent, Msg1 ++ Msg2};
_ ->
{error, Msg1 ++ Msg2} {error, Msg1 ++ Msg2}
end
end; end;
_ -> _ ->
case file:consult(File) of case file:consult(File) of
{ok, Terms} -> {ok, Terms} ->
{ok, Terms}; {ok, Terms};
{error, enoent} ->
{error, enoent};
{error, {LineNumber, erl_parse, _ParseMessage} = Reason} -> {error, {LineNumber, erl_parse, _ParseMessage} = Reason} ->
{error, describe_config_problem(File, Reason, LineNumber)}; {error, describe_config_problem(File, Reason, LineNumber)};
{error, Reason} -> {error, Reason} ->
case Reason of
enoent ->
{error, enoent, describe_config_problem(File, Reason)};
_ ->
{error, describe_config_problem(File, Reason)} {error, describe_config_problem(File, Reason)}
end end
end
end. end.
parserl(<<"> ", Term/binary>>) -> parserl(<<"> ", Term/binary>>) ->
@ -488,7 +513,7 @@ transform_include_option({include_config_file, Filename, Options}) ->
{Filename, Options}. {Filename, Options}.
include_config_file(Filename, Options) -> include_config_file(Filename, Options) ->
Included_terms = get_plain_terms_file(Filename), Included_terms = get_plain_terms_file(Filename, [{include_files, true}, dont_halt_on_error]),
Disallow = proplists:get_value(disallow, Options, []), Disallow = proplists:get_value(disallow, Options, []),
Included_terms2 = delete_disallowed(Disallow, Included_terms), Included_terms2 = delete_disallowed(Disallow, Included_terms),
Allow_only = proplists:get_value(allow_only, Options, all), Allow_only = proplists:get_value(allow_only, Options, all),