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

Remove previous options when the config gets reloaded

Browse Source
This commit is contained in:
Evgeniy Khramtsov 2017-02-24 17:03:11 +03:00
parent 0124d292b5
commit 03e2b0f0bf
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/ejabberd_config.erl
View File

@ -66,11 +66,8 @@
start() -> start() ->
mnesia_init(), mnesia_init(),
Config = get_ejabberd_config_path(), ConfigFile = get_ejabberd_config_path(),
State0 = read_file(Config), State1 = load_file(ConfigFile),
State1 = hosts_to_start(State0),
State2 = validate_opts(State1),
%% This start time is used by mod_last:
UnixTime = p1_time_compat:system_time(seconds), UnixTime = p1_time_compat:system_time(seconds),
SharedKey = case erlang:get_cookie() of SharedKey = case erlang:get_cookie() of
nocookie -> nocookie ->
@ -78,9 +75,9 @@ start() ->
Cookie -> Cookie ->
p1_sha:sha(jlib:atom_to_binary(Cookie)) p1_sha:sha(jlib:atom_to_binary(Cookie))
end, end,
State3 = set_option({node_start, global}, UnixTime, State2), State2 = set_option({node_start, global}, UnixTime, State1),
State4 = set_option({shared_key, global}, SharedKey, State3), State3 = set_option({shared_key, global}, SharedKey, State2),
set_opts(State4). set_opts(State3).
%% When starting ejabberd for testing, we sometimes want to start a %% When starting ejabberd for testing, we sometimes want to start a
%% subset of hosts from the one define in the config file. %% subset of hosts from the one define in the config file.
@ -183,19 +180,20 @@ read_file(File, Opts) ->
State1 = lists:foldl(fun process_term/2, State, Head ++ Tail), State1 = lists:foldl(fun process_term/2, State, Head ++ Tail),
State1#state{opts = compact(State1#state.opts)}. State1#state{opts = compact(State1#state.opts)}.
-spec load_file(string()) -> ok. -spec load_file(string()) -> #state{}.
load_file(File) -> load_file(File) ->
State0 = read_file(File), State0 = read_file(File),
State = validate_opts(State0), State1 = hosts_to_start(State0),
set_opts(State). validate_opts(State1).
-spec reload_file() -> ok. -spec reload_file() -> ok.
reload_file() -> reload_file() ->
Config = get_ejabberd_config_path(), Config = get_ejabberd_config_path(),
OldHosts = get_myhosts(), OldHosts = get_myhosts(),
load_file(Config), State = load_file(Config),
set_opts(State),
NewHosts = get_myhosts(), NewHosts = get_myhosts(),
lists:foreach( lists:foreach(
fun(Host) -> fun(Host) ->
@ -766,9 +764,12 @@ append_option({Opt, Host}, Val, State) ->
set_opts(State) -> set_opts(State) ->
Opts = State#state.opts, Opts = State#state.opts,
F = fun() -> F = fun() ->
lists:foreach(fun(R) -> lists:foreach(
mnesia:write(R) fun({node_start, _}) -> ok;
end, Opts) ({shared_key, _}) -> ok;
(Key) -> mnesia:delete({local_config, Key})
end, mnesia:all_keys(local_config)),
lists:foreach(fun mnesia:write/1, Opts)
end, end,
case mnesia:transaction(F) of case mnesia:transaction(F) of
{atomic, _} -> ok; {atomic, _} -> ok;