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

Merge pull request #7383 from zmstone/minor-fixes 

Minor fixes 4.4
This commit is contained in:
Zaiming (Stone) Shi 2022-03-24 11:26:05 +01:00 committed by GitHub
parent d1503731a1 ada29de3d5
commit 59b8fd6ff8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/emqx_auth_mongo/src/emqx_auth_mongo.appup.src
View File

@ -1,15 +1,21 @@
%% -*- 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.4.1",[{load_module,emqx_auth_mongo,brutal_purge,soft_purge,[]}]}, [{"4.4.1",
[{load_module,emqx_auth_mongo_sup,brutal_purge,soft_purge,[]},
{load_module,emqx_auth_mongo,brutal_purge,soft_purge,[]}]},
{"4.4.0", {"4.4.0",
[{load_module,emqx_auth_mongo_app,brutal_purge,soft_purge,[]}, [{load_module,emqx_auth_mongo_sup,brutal_purge,soft_purge,[]},
{load_module,emqx_auth_mongo_app,brutal_purge,soft_purge,[]},
{load_module,emqx_auth_mongo,brutal_purge,soft_purge,[]}, {load_module,emqx_auth_mongo,brutal_purge,soft_purge,[]},
{load_module,emqx_acl_mongo,brutal_purge,soft_purge,[]}]}, {load_module,emqx_acl_mongo,brutal_purge,soft_purge,[]}]},
{<<".*">>,[]}], {<<".*">>,[]}],
[{"4.4.1",[{load_module,emqx_auth_mongo,brutal_purge,soft_purge,[]}]}, [{"4.4.1",
[{load_module,emqx_auth_mongo_sup,brutal_purge,soft_purge,[]},
{load_module,emqx_auth_mongo,brutal_purge,soft_purge,[]}]},
{"4.4.0", {"4.4.0",
[{load_module,emqx_auth_mongo_app,brutal_purge,soft_purge,[]}, [{load_module,emqx_auth_mongo_sup,brutal_purge,soft_purge,[]},
{load_module,emqx_auth_mongo_app,brutal_purge,soft_purge,[]},
{load_module,emqx_auth_mongo,brutal_purge,soft_purge,[]}, {load_module,emqx_auth_mongo,brutal_purge,soft_purge,[]},
{load_module,emqx_acl_mongo,brutal_purge,soft_purge,[]}]}, {load_module,emqx_acl_mongo,brutal_purge,soft_purge,[]}]},
{<<".*">>,[]}]}. {<<".*">>,[]}]}.

3
apps/emqx_auth_mongo/src/emqx_auth_mongo_sup.erl
View File

@ -34,7 +34,8 @@ init([]) ->
{ok, {{one_for_all, 10, 100}, [PoolSpec]}}. {ok, {{one_for_all, 10, 100}, [PoolSpec]}}.
may_parse_srv_and_txt_records(Opts) when is_list(Opts) -> may_parse_srv_and_txt_records(Opts) when is_list(Opts) ->
maps:to_list(may_parse_srv_and_txt_records(maps:from_list(Opts))); Default = #{srv_record => false},
maps:to_list(may_parse_srv_and_txt_records(maps:merge(Default, maps:from_list(Opts))));
may_parse_srv_and_txt_records(#{type := Type, may_parse_srv_and_txt_records(#{type := Type,
srv_record := false, srv_record := false,

4
apps/emqx_management/src/emqx_mgmt_data_backup.erl
View File

@ -650,7 +650,7 @@ list_backup_file() ->
lists:filtermap(Filter, backup_files()). lists:filtermap(Filter, backup_files()).
backup_files() -> backup_files() ->
backup_files(backup_dir()) ++ backup_files(backup_dir_odl_version()). backup_files(backup_dir()) ++ backup_files(backup_dir_old_version()).
backup_files(Dir) -> backup_files(Dir) ->
{ok, FilesAll} = file:list_dir_all(Dir), {ok, FilesAll} = file:list_dir_all(Dir),
@ -840,7 +840,7 @@ backup_dir() ->
ok = filelib:ensure_dir(filename:join([Dir, dummy])), ok = filelib:ensure_dir(filename:join([Dir, dummy])),
Dir. Dir.
backup_dir_odl_version() -> backup_dir_old_version() ->
emqx:get_env(data_dir). emqx:get_env(data_dir).
legal_filename(Filename) -> legal_filename(Filename) ->

2
etc/emqx.conf
View File

@ -1,4 +1,4 @@
## EMQX Configuration 4.3 ## EMQX Configuration
## NOTE: Do not change format of CONFIG_SECTION_{BGN,END} comments! ## NOTE: Do not change format of CONFIG_SECTION_{BGN,END} comments!