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

refactor: do not differentiate node roles

This commit is contained in:
Thales Macedo Garitezi 2022-04-26 12:14:38 -03:00
parent 8519948742
commit 67ed7ba7b8
No known key found for this signature in database
GPG Key ID: DD279F8152A9B6DD
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/emqx_conf/src/emqx_conf_app.erl
View File

@ -35,11 +35,10 @@ stop(_State) ->
get_override_config_file() -> get_override_config_file() ->
Node = node(), Node = node(),
Role = mria_rlog:role(),
case emqx_app:get_init_config_load_done() of case emqx_app:get_init_config_load_done() of
false -> false ->
{error, #{node => Node, msg => "init_conf_load_not_done"}}; {error, #{node => Node, msg => "init_conf_load_not_done"}};
true when Role =:= core -> true ->
case erlang:whereis(emqx_config_handler) of case erlang:whereis(emqx_config_handler) of
undefined -> undefined ->
{error, #{node => Node, msg => "emqx_config_handler_not_ready"}}; {error, #{node => Node, msg => "emqx_config_handler_not_ready"}};
@ -54,9 +53,7 @@ get_override_config_file() ->
{atomic, Res} -> {ok, Res}; {atomic, Res} -> {ok, Res};
{aborted, Reason} -> {error, #{node => Node, msg => Reason}} {aborted, Reason} -> {error, #{node => Node, msg => Reason}}
end end
end; end
true when Role =:= replicant ->
{ignore, #{node => Node}}
end. end.
%% ------------------------------------------------------------------------------ %% ------------------------------------------------------------------------------