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

Merge pull request #8660 from zhongwencool/enabled-default-modules 

fix: enable emqx_mod_module if default_plugins
This commit is contained in:
zhongwencool 2022-08-09 14:17:31 +08:00 committed by GitHub
parent b8a2b8f4f4 e9a5c4295c
commit 19792bc2d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/emqx_sn/examples/simple_example2.erl
View File

@ -6,6 +6,7 @@
-define(PORT, 1884). -define(PORT, 1884).
-export([start/0]). -export([start/0]).
-export([gen_register_packet/2]).
start() -> start() ->
io:format("start to connect ~p:~p~n", [?HOST, ?PORT]), io:format("start to connect ~p:~p~n", [?HOST, ?PORT]),

1
apps/emqx_sn/examples/simple_example3.erl
View File

@ -6,6 +6,7 @@
-define(PORT, 1884). -define(PORT, 1884).
-export([start/0]). -export([start/0]).
-export([gen_register_packet/2]).
start() -> start() ->
io:format("start to connect ~p:~p~n", [?HOST, ?PORT]), io:format("start to connect ~p:~p~n", [?HOST, ?PORT]),

2
apps/emqx_sn/examples/simple_example4.erl
View File

@ -5,7 +5,7 @@
-define(HOST, {127,0,0,1}). -define(HOST, {127,0,0,1}).
-define(PORT, 1884). -define(PORT, 1884).
-export([start/0]). -export([start/1]).
start(LoopTimes) -> start(LoopTimes) ->
io:format("start to connect ~p:~p~n", [?HOST, ?PORT]), io:format("start to connect ~p:~p~n", [?HOST, ?PORT]),

12
src/emqx.appup.src
View File

@ -1,13 +1,17 @@
%% -*- mode: erlang -*- %% -*- mode: erlang -*-
%% Unless you know what you are doing, DO NOT edit manually!! %% Unless you know what you are doing, DO NOT edit manually!!
{VSN, {VSN,
[{"4.3.18",[{load_module,emqx_app,brutal_purge,soft_purge,[]}]}, [
{"4.3.18",
[{load_module,emqx_app,brutal_purge,soft_purge,[]},
{load_module,emqx_plugins,brutal_purge,soft_purge,[]}]},
{"4.3.17", {"4.3.17",
[{load_module,emqx_exclusive_subscription,brutal_purge,soft_purge,[]}, [{load_module,emqx_exclusive_subscription,brutal_purge,soft_purge,[]},
{load_module,emqx_session,brutal_purge,soft_purge,[]}, {load_module,emqx_session,brutal_purge,soft_purge,[]},
{load_module,emqx_shared_sub,brutal_purge,soft_purge,[]}, {load_module,emqx_shared_sub,brutal_purge,soft_purge,[]},
{update,emqx_broker_sup,supervisor}, {update,emqx_broker_sup,supervisor},
{load_module,emqx_app,brutal_purge,soft_purge,[]}, {load_module,emqx_app,brutal_purge,soft_purge,[]},
{load_module,emqx_plugins,brutal_purge,soft_purge,[]},
{load_module,emqx_access_control,brutal_purge,soft_purge,[]}]}, {load_module,emqx_access_control,brutal_purge,soft_purge,[]}]},
{"4.3.16", {"4.3.16",
[{load_module,emqx_session,brutal_purge,soft_purge,[]}, [{load_module,emqx_session,brutal_purge,soft_purge,[]},
@ -678,13 +682,17 @@
{load_module,emqx_message,brutal_purge,soft_purge,[]}, {load_module,emqx_message,brutal_purge,soft_purge,[]},
{load_module,emqx_limiter,brutal_purge,soft_purge,[]}]}, {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
{<<".*">>,[]}], {<<".*">>,[]}],
[{"4.3.18",[{load_module,emqx_app,brutal_purge,soft_purge,[]}]}, [
{"4.3.18",
[{load_module,emqx_app,brutal_purge,soft_purge,[]},
{load_module,emqx_plugins,brutal_purge,soft_purge,[]}]},
{"4.3.17", {"4.3.17",
[{load_module,emqx_exclusive_subscription,brutal_purge,soft_purge,[]}, [{load_module,emqx_exclusive_subscription,brutal_purge,soft_purge,[]},
{load_module,emqx_session,brutal_purge,soft_purge,[]}, {load_module,emqx_session,brutal_purge,soft_purge,[]},
{load_module,emqx_shared_sub,brutal_purge,soft_purge,[]}, {load_module,emqx_shared_sub,brutal_purge,soft_purge,[]},
{update,emqx_broker_sup,supervisor}, {update,emqx_broker_sup,supervisor},
{load_module,emqx_app,brutal_purge,soft_purge,[]}, {load_module,emqx_app,brutal_purge,soft_purge,[]},
{load_module,emqx_plugins,brutal_purge,soft_purge,[]},
{load_module,emqx_access_control,brutal_purge,soft_purge,[]}]}, {load_module,emqx_access_control,brutal_purge,soft_purge,[]}]},
{"4.3.16", {"4.3.16",
[{load_module,emqx_session,brutal_purge,soft_purge,[]}, [{load_module,emqx_session,brutal_purge,soft_purge,[]},

4
src/emqx_plugins.erl
View File

@ -219,7 +219,7 @@ ensure_file(File) ->
false -> false ->
DefaultPlugins = [ {emqx_management, true} DefaultPlugins = [ {emqx_management, true}
, {emqx_dashboard, true} , {emqx_dashboard, true}
, {emqx_modules, false} , {emqx_modules, true}
, {emqx_recon, true} , {emqx_recon, true}
, {emqx_retainer, true} , {emqx_retainer, true}
, {emqx_telemetry, true} , {emqx_telemetry, true}
@ -265,7 +265,7 @@ load_plugins(Names, Persistent) ->
[] -> ok; [] -> ok;
NotFound -> ?LOG(alert, "cannot_find_plugins: ~p", [NotFound]) NotFound -> ?LOG(alert, "cannot_find_plugins: ~p", [NotFound])
end, end,
NeedToLoad = Names -- NotFound -- names(started_app), NeedToLoad = (Names -- NotFound) -- names(started_app),
lists:foreach(fun(Name) -> lists:foreach(fun(Name) ->
Plugin = find_plugin(Name, Plugins), Plugin = find_plugin(Name, Plugins),
load_plugin(Plugin#plugin.name, Persistent) load_plugin(Plugin#plugin.name, Persistent)

2
test/emqx_broker_sup_SUITE.erl
View File

@ -61,5 +61,5 @@ t_restart_shared_sub(Config) when is_list(Config) ->
after 2000 -> after 2000 ->
false false
end); end);
t_restart_shared_sub({'end', Config}) -> t_restart_shared_sub({'end', _Config}) ->
emqx:unsubscribe(<<"$share/grpa/t/a">>). emqx:unsubscribe(<<"$share/grpa/t/a">>).

2
test/emqx_plugins_SUITE.erl
View File

@ -100,7 +100,7 @@ t_ensure_default_loaded_plugins_file(Config) ->
[ {emqx_bridge_mqtt, false} [ {emqx_bridge_mqtt, false}
, {emqx_dashboard, true} , {emqx_dashboard, true}
, {emqx_management, true} , {emqx_management, true}
, {emqx_modules, false} , {emqx_modules, true}
, {emqx_recon, true} , {emqx_recon, true}
, {emqx_retainer, true} , {emqx_retainer, true}
, {emqx_rule_engine, true} , {emqx_rule_engine, true}