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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx/include/emqx_release.hrl
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").

2
apps/emqx_machine/src/emqx_machine.app.src
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]},

12
apps/emqx_machine/src/emqx_machine_boot.erl
View File

@ -126,7 +126,6 @@ reboot_apps() ->
BaseRebootApps ++ ConfigApps. BaseRebootApps ++ ConfigApps.
basic_reboot_apps() -> basic_reboot_apps() ->
CE =
?BASIC_REBOOT_APPS ++ ?BASIC_REBOOT_APPS ++
[ [
emqx_prometheus, emqx_prometheus,
@ -147,11 +146,12 @@ basic_reboot_apps() ->
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
ce -> CE; basic_reboot_apps_enterprise(ee) ->
ee -> CE ++ [] [emqx_license];
end. basic_reboot_apps_enterprise(_) ->
[].
sorted_reboot_apps() -> sorted_reboot_apps() ->
Apps = [{App, app_deps(App)} || App <- reboot_apps()], Apps = [{App, app_deps(App)} || App <- reboot_apps()],