fix: reboot `emqx_license` app for join cluster

This commit is contained in:
JimMoen 2023-05-23 14:42:41 +08:00
parent 326c71205d
commit 6c36152612
No known key found for this signature in database
GPG Key ID: 87A520B4F76BA86D
3 changed files with 28 additions and 28 deletions

View File

@ -35,7 +35,7 @@
-define(EMQX_RELEASE_CE, "5.0.21"). -define(EMQX_RELEASE_CE, "5.0.21").
%% Enterprise edition %% Enterprise edition
-define(EMQX_RELEASE_EE, "5.0.2"). -define(EMQX_RELEASE_EE, "5.0.2-patch-00").
%% the HTTP API version %% the HTTP API version
-define(EMQX_API_VERSION, "5.0"). -define(EMQX_API_VERSION, "5.0").

View File

@ -3,7 +3,7 @@
{id, "emqx_machine"}, {id, "emqx_machine"},
{description, "The EMQX Machine"}, {description, "The EMQX Machine"},
% strict semver, bump manually! % strict semver, bump manually!
{vsn, "0.2.1"}, {vsn, "0.2.2"},
{modules, []}, {modules, []},
{registered, []}, {registered, []},
{applications, [kernel, stdlib, emqx_ctl]}, {applications, [kernel, stdlib, emqx_ctl]},

View File

@ -126,32 +126,32 @@ reboot_apps() ->
BaseRebootApps ++ ConfigApps. BaseRebootApps ++ ConfigApps.
basic_reboot_apps() -> basic_reboot_apps() ->
CE = ?BASIC_REBOOT_APPS ++
?BASIC_REBOOT_APPS ++ [
[ emqx_prometheus,
emqx_prometheus, emqx_modules,
emqx_modules, emqx_dashboard,
emqx_dashboard, emqx_connector,
emqx_connector, emqx_gateway,
emqx_gateway, emqx_statsd,
emqx_statsd, emqx_resource,
emqx_resource, emqx_rule_engine,
emqx_rule_engine, emqx_bridge,
emqx_bridge, emqx_plugin_libs,
emqx_plugin_libs, emqx_management,
emqx_management, emqx_retainer,
emqx_retainer, emqx_exhook,
emqx_exhook, emqx_authn,
emqx_authn, emqx_authz,
emqx_authz, emqx_slow_subs,
emqx_slow_subs, emqx_auto_subscribe,
emqx_auto_subscribe, emqx_plugins
emqx_plugins ] ++ basic_reboot_apps_enterprise(emqx_release:edition()).
],
case emqx_release:edition() of basic_reboot_apps_enterprise(ee) ->
ce -> CE; [emqx_license];
ee -> CE ++ [] basic_reboot_apps_enterprise(_) ->
end. [].
sorted_reboot_apps() -> sorted_reboot_apps() ->
Apps = [{App, app_deps(App)} || App <- reboot_apps()], Apps = [{App, app_deps(App)} || App <- reboot_apps()],