chore: update changes

This commit is contained in:
JianBo He 2023-04-15 21:18:37 +08:00 committed by Ivan Dyachkov
parent f2fae16d3b
commit 069afd042a
2 changed files with 11 additions and 2 deletions

View File

@ -272,7 +272,7 @@ chkconfig(File) ->
end. end.
check_license(Config) -> check_license(Config) ->
ok = application:load(emqx_license), ok = ensure_application_load(emqx_license),
%% This checks formal license validity to ensure %% This checks formal license validity to ensure
%% that the node can successfully start with the given license. %% that the node can successfully start with the given license.
@ -368,7 +368,7 @@ add_lib_dir(RootDir, Name, Vsn) ->
%% %%
%% It helps to implement the feature of dynamically searching schema. %% It helps to implement the feature of dynamically searching schema.
%% See `emqx_gateway_schema:fields(gateway)` %% See `emqx_gateway_schema:fields(gateway)`
is_emqx_application(Name) andalso application:load(Name), is_emqx_application(Name) andalso ensure_application_load(Name),
ok; ok;
{error, _} -> error(LibDir) {error, _} -> error(LibDir)
end. end.
@ -379,3 +379,10 @@ is_emqx_application("emqx_" ++ _Rest) ->
true; true;
is_emqx_application(_) -> is_emqx_application(_) ->
false. false.
ensure_application_load(Name) ->
case application:load(Name) of
ok -> ok;
{error, {already_loaded, _}} -> ok;
{error, Reason} -> error({failed_to_load_application, Name, Reason})
end.

View File

@ -0,0 +1,2 @@
Fix EMQX starting failed once any gateways configured in emqx.conf.
This issue was first introduced in v5.0.22 via [#10278](https://github.com/emqx/emqx/pull/10278).