diff --git a/apps/emqx_auth_mongo/src/emqx_auth_mongo.appup.src b/apps/emqx_auth_mongo/src/emqx_auth_mongo.appup.src index f05fa9de1..641ce3e93 100644 --- a/apps/emqx_auth_mongo/src/emqx_auth_mongo.appup.src +++ b/apps/emqx_auth_mongo/src/emqx_auth_mongo.appup.src @@ -1,15 +1,21 @@ %% -*- mode: erlang -*- %% Unless you know what you are doing, DO NOT edit manually!! {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", - [{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_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", - [{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_acl_mongo,brutal_purge,soft_purge,[]}]}, {<<".*">>,[]}]}. diff --git a/apps/emqx_auth_mongo/src/emqx_auth_mongo_sup.erl b/apps/emqx_auth_mongo/src/emqx_auth_mongo_sup.erl index 55263494a..982b20727 100644 --- a/apps/emqx_auth_mongo/src/emqx_auth_mongo_sup.erl +++ b/apps/emqx_auth_mongo/src/emqx_auth_mongo_sup.erl @@ -34,7 +34,8 @@ init([]) -> {ok, {{one_for_all, 10, 100}, [PoolSpec]}}. 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, srv_record := false, diff --git a/apps/emqx_management/src/emqx_mgmt_data_backup.erl b/apps/emqx_management/src/emqx_mgmt_data_backup.erl index d5c6c7b97..aa2cbc40f 100644 --- a/apps/emqx_management/src/emqx_mgmt_data_backup.erl +++ b/apps/emqx_management/src/emqx_mgmt_data_backup.erl @@ -650,7 +650,7 @@ list_backup_file() -> lists:filtermap(Filter, 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) -> {ok, FilesAll} = file:list_dir_all(Dir), @@ -840,7 +840,7 @@ backup_dir() -> ok = filelib:ensure_dir(filename:join([Dir, dummy])), Dir. -backup_dir_odl_version() -> +backup_dir_old_version() -> emqx:get_env(data_dir). legal_filename(Filename) -> diff --git a/etc/emqx.conf b/etc/emqx.conf index 8b8c0aca4..3b4cca025 100644 --- a/etc/emqx.conf +++ b/etc/emqx.conf @@ -1,4 +1,4 @@ -## EMQX Configuration 4.3 +## EMQX Configuration ## NOTE: Do not change format of CONFIG_SECTION_{BGN,END} comments!