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

fix(emqx_schema): resolve os env in translation 

default value is a part of schema which should be static and
deterministic between different run-time or build-time environment
This commit is contained in:
Zaiming Shi 2021-07-29 00:57:40 +02:00
parent 2fcb9124bf
commit 085d6c9ba0
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
apps/emqx/src/emqx_schema.erl
View File

@ -153,10 +153,8 @@ fields("node") ->
sensitive => true, sensitive => true,
override_env => "EMQX_NODE_COOKIE" override_env => "EMQX_NODE_COOKIE"
})} })}
, {"data_dir", t(string(), undefined, undefined)} , {"data_dir", t(string())}
, {"config_files", t(list(string()), "emqx.config_files", , {"config_files", t(comma_separated_list())}
[ filename:join([os:getenv("RUNNER_ETC_DIR"), "emqx.conf"])
])}
, {"global_gc_interval", t(duration(), undefined, "15m")} , {"global_gc_interval", t(duration(), undefined, "15m")}
, {"crash_dump_dir", t(file(), "vm_args.-env ERL_CRASH_DUMP", undefined)} , {"crash_dump_dir", t(file(), "vm_args.-env ERL_CRASH_DUMP", undefined)}
, {"dist_net_ticktime", t(duration(), "vm_args.-kernel net_ticktime", "2m")} , {"dist_net_ticktime", t(duration(), "vm_args.-kernel net_ticktime", "2m")}
@ -511,14 +509,31 @@ base_listener() ->
, {"rate_limit", ref("rate_limit")} , {"rate_limit", ref("rate_limit")}
]. ].
translations() -> ["ekka", "kernel"]. translations() -> ["ekka", "kernel", "emqx"].
translation("ekka") -> translation("ekka") ->
[ {"cluster_discovery", fun tr_cluster__discovery/1}]; [ {"cluster_discovery", fun tr_cluster__discovery/1}];
translation("kernel") -> translation("kernel") ->
[ {"logger_level", fun tr_logger_level/1} [ {"logger_level", fun tr_logger_level/1}
, {"logger", fun tr_logger/1}]. , {"logger", fun tr_logger/1}];
translation("emqx") ->
[ {"config_files", fun tr_config_files/1}
].
tr_config_files(Conf) ->
case conf_get("emqx.config_files", Conf) of
[_ | _] = Files ->
Files;
_ ->
case os:getenv("RUNNER_ETC_DIR") of
false ->
[filename:join([code:lib_dir(emqx), "etc", "emqx.conf"])];
Dir ->
[filename:join([Dir, "emqx.conf"])]
end
end.
tr_cluster__discovery(Conf) -> tr_cluster__discovery(Conf) ->
Strategy = conf_get("cluster.discovery_strategy", Conf), Strategy = conf_get("cluster.discovery_strategy", Conf),