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

Merge pull request #4921 from zmstone/ensire-emqx_app-always-reloaded 

chore(appup): ensure emqx_app always loaded in appup
This commit is contained in:
Zaiming (Stone) Shi 2021-06-03 17:32:03 +02:00 committed by GitHub
parent 4b22b4dccd 54458e3924
commit d4ba555967
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/update_appup.escript
View File

@ -3,7 +3,10 @@
main(_Args) ->
ChangedFiles = string:lexemes(os:cmd("git diff --name-only origin/master..HEAD"), "\n"),
AppModules = group_modules(lists:filtermap(fun filter_erlang_modules/1, ChangedFiles)),
AppModules0 = lists:filtermap(fun filter_erlang_modules/1, ChangedFiles),
%% emqx_app must always be included as we bump version number in emqx_release.hrl for each release
AppModules1 = [{emqx, emqx_app} | AppModules0],
AppModules = group_modules(AppModules1),
io:format("Changed modules: ~p~n", [AppModules]),
_ = maps:map(fun process_app/2, AppModules),
ok.

6
src/emqx.appup.src
View File

@ -2,7 +2,8 @@
{VSN,
[{"4.3.2",
[{load_module,emqx_http_lib,brutal_purge,soft_purge,[]},
{load_module,emqx_channel,brutal_purge,soft_purge,[]}]},
{load_module,emqx_channel,brutal_purge,soft_purge,[]},
{load_module,emqx_app,brutal_purge,soft_purge,[]}]},
{"4.3.1",
[{load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
{load_module,emqx_connection,brutal_purge,soft_purge,[]},
@ -34,7 +35,8 @@
{<<".*">>,[]}],
[{"4.3.2",
[{load_module,emqx_http_lib,brutal_purge,soft_purge,[]},
{load_module,emqx_channel,brutal_purge,soft_purge,[]}]},
{load_module,emqx_channel,brutal_purge,soft_purge,[]},
{load_module,emqx_app,brutal_purge,soft_purge,[]}]},
{"4.3.1",
[{load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
{load_module,emqx_connection,brutal_purge,soft_purge,[]},