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

fix: elvis warning

This commit is contained in:
Zhongwen Deng 2022-06-28 15:29:26 +08:00
parent 6372456211
commit c3cd36f610
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,17 +139,7 @@ copy_override_conf_from_core_node() ->
copy_override_conf_from_core_node() copy_override_conf_from_core_node()
end; end;
_ -> _ ->
SortFun = fun( [{ok, Info} | _] = lists:sort(fun conf_sort/2, Ready),
{ok, #{wall_clock := W1, tnx_id := TnxId1}},
{ok, #{wall_clock := W2, tnx_id := TnxId2}}
) ->
if
TnxId1 > TnxId2 -> true;
TnxId1 =:= TnxId2 -> W1 > W2;
true -> false
end
end,
[{ok, Info} | _] = lists:sort(SortFun, Ready),
#{node := Node, conf := RawOverrideConf, tnx_id := TnxId} = Info, #{node := Node, conf := RawOverrideConf, tnx_id := TnxId} = Info,
Msg = #{ Msg = #{
msg => "copy_overide_conf_from_core_node_success", msg => "copy_overide_conf_from_core_node_success",
@ -177,3 +167,9 @@ should_proceed_with_boot() ->
%% be up. Try again. %% be up. Try again.
false false
end. end.
conf_sort({ok, #{tnx_id := Id1}}, {ok, #{tnx_id := Id2}}) when Id1 > Id2 -> true;
conf_sort({ok, #{tnx_id := Id, wall_clock := W1}}, {ok, #{tnx_id := Id, wall_clock := W2}}) ->
W1 > W2;
conf_sort({ok, _}, {ok, _}) ->
false.