yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: save app env when bootstrap and reload

This commit is contained in:
Zhongwen Deng 2023-01-13 18:36:03 +08:00
parent 1085492171
commit c9f0355f5a
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/emqx/src/emqx_config.erl
View File

@ -333,7 +333,8 @@ init_load(SchemaMod, RawConf, Opts) when is_map(RawConf) ->
RootNames = get_root_names(), RootNames = get_root_names(),
RawConfAll = raw_conf_with_default(SchemaMod, RootNames, RawConfWithOverrides, Opts), RawConfAll = raw_conf_with_default(SchemaMod, RootNames, RawConfWithOverrides, Opts),
%% check configs against the schema %% check configs against the schema
{_AppEnvs, CheckedConf} = check_config(SchemaMod, RawConfAll, #{}), {AppEnvs, CheckedConf} = check_config(SchemaMod, RawConfAll, #{}),
save_to_app_env(AppEnvs),
ok = save_to_config_map(CheckedConf, RawConfAll). ok = save_to_config_map(CheckedConf, RawConfAll).
%% keep the raw and non-raw conf has the same keys to make update raw conf easier. %% keep the raw and non-raw conf has the same keys to make update raw conf easier.
@ -534,23 +535,19 @@ get_root_names() ->
maps:get(names, persistent_term:get(?PERSIS_SCHEMA_MODS, #{names => []})). maps:get(names, persistent_term:get(?PERSIS_SCHEMA_MODS, #{names => []})).
-spec save_configs(app_envs(), config(), raw_config(), raw_config(), update_opts()) -> ok. -spec save_configs(app_envs(), config(), raw_config(), raw_config(), update_opts()) -> ok.
save_configs(_AppEnvs, Conf, RawConf, OverrideConf, Opts) -> save_configs(AppEnvs, Conf, RawConf, OverrideConf, Opts) ->
%% We first try to save to override.conf, because saving to files is more error prone %% We first try to save to override.conf, because saving to files is more error prone
%% than saving into memory. %% than saving into memory.
ok = save_to_override_conf(OverrideConf, Opts), ok = save_to_override_conf(OverrideConf, Opts),
%% We may need also support hot config update for the apps that use application envs. save_to_app_env(AppEnvs),
%% If that is the case uncomment the following line to update the configs to app env
%save_to_app_env(_AppEnvs),
save_to_config_map(Conf, RawConf). save_to_config_map(Conf, RawConf).
-define(IGNORE_APPS, [kernel]).
-spec save_to_app_env([tuple()]) -> ok. -spec save_to_app_env([tuple()]) -> ok.
save_to_app_env(AppEnvs) -> save_to_app_env(AppEnvs0) ->
lists:foreach( AppEnvs = lists:filter(fun({App, _}) -> not lists:member(App, ?IGNORE_APPS) end, AppEnvs0),
fun({AppName, Envs}) -> application:set_env(AppEnvs).
[application:set_env(AppName, Par, Val) || {Par, Val} <- Envs]
end,
AppEnvs
).
-spec save_to_config_map(config(), raw_config()) -> ok. -spec save_to_config_map(config(), raw_config()) -> ok.
save_to_config_map(Conf, RawConf) -> save_to_config_map(Conf, RawConf) ->