diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config index f3295fc1c..9e2234b81 100644 --- a/apps/emqx/rebar.config +++ b/apps/emqx/rebar.config @@ -29,7 +29,7 @@ {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.1"}}}, {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.12.3"}}}, {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}}, - {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.26.7"}}}, + {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.27.2"}}}, {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}}, {recon, {git, "https://github.com/ferd/recon", {tag, "2.5.1"}}}, {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "0.18.0"}}} diff --git a/apps/emqx_dashboard/src/emqx_dashboard.erl b/apps/emqx_dashboard/src/emqx_dashboard.erl index 7f7a029a7..0c4fae5fe 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard.erl +++ b/apps/emqx_dashboard/src/emqx_dashboard.erl @@ -129,13 +129,13 @@ get_i18n() -> application:get_env(emqx_dashboard, i18n). init_i18n(File, Lang) -> - Cache = hocon_schema:new_cache(File), + Cache = hocon_schema:new_desc_cache(File), application:set_env(emqx_dashboard, i18n, #{lang => atom_to_binary(Lang), cache => Cache}). clear_i18n() -> case application:get_env(emqx_dashboard, i18n) of {ok, #{cache := Cache}} -> - hocon_schema:delete_cache(Cache), + hocon_schema:delete_desc_cache(Cache), application:unset_env(emqx_dashboard, i18n); undefined -> ok diff --git a/apps/emqx_prometheus/rebar.config b/apps/emqx_prometheus/rebar.config index 36a53d1bb..ba1b7eb14 100644 --- a/apps/emqx_prometheus/rebar.config +++ b/apps/emqx_prometheus/rebar.config @@ -4,7 +4,7 @@ [ {emqx, {path, "../emqx"}}, %% FIXME: tag this as v3.1.3 {prometheus, {git, "https://github.com/deadtrickster/prometheus.erl", {tag, "v4.8.1"}}}, - {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.26.7"}}} + {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.27.2"}}} ]}. {edoc_opts, [{preprocess, true}]}. diff --git a/bin/emqx.cmd b/bin/emqx.cmd index 6d7ec4cda..37e541c7b 100644 --- a/bin/emqx.cmd +++ b/bin/emqx.cmd @@ -24,7 +24,7 @@ @set script=%~n0 -:: for remote_console +:: for attach and remote_console @set EPMD_ARG=-start_epmd false -epmd_module ekka_epmd -proto_dist ekka :: for erl command @set ERL_FLAGS=%EPMD_ARG% @@ -65,6 +65,9 @@ @set HOCON_ENV_OVERRIDE_PREFIX=EMQX_ @set node_type=-name @set schema_mod=emqx_conf_schema +:: no advanced DB backend for Windows +@set EMQX_DB__BACKEND=mnesia +@set EMQX_DB__ROLE=core @set conf_path="%etc_dir%\emqx.conf" :: Extract node name from emqx.conf @@ -212,8 +215,7 @@ cd /d "%rel_root_dir%" @echo off cd /d %rel_root_dir% @echo on -@start "%rel_name% console" %werl% -mode embedded -boot "%boot_file_name%" %args% -@echo emqx is started! +%erl_exe% -mode embedded -boot "%boot_file_name%" %args% @goto :eof :: Ping the running node @@ -234,7 +236,7 @@ cd /d %rel_root_dir% :: Attach to a running node :attach -@start "remsh_%nodename%" %werl% -hidden -remsh "%node_name%" -boot "%clean_boot_file_name%" "%node_type%" "remsh_%node_name%" -setcookie "%node_cookie%" +%erl_exe% -hidden -remsh "%node_name%" -boot "%clean_boot_file_name%" "%node_type%" "remsh_%node_name%" -setcookie "%node_cookie%" @goto :eof :: Trim variable diff --git a/mix.exs b/mix.exs index bd4430e74..da6571a76 100644 --- a/mix.exs +++ b/mix.exs @@ -68,7 +68,7 @@ defmodule EMQXUmbrella.MixProject do # in conflict by emqtt and hocon {:getopt, "1.0.2", override: true}, {:snabbkaffe, github: "kafka4beam/snabbkaffe", tag: "0.18.0", override: true}, - {:hocon, github: "emqx/hocon", tag: "0.26.7", override: true}, + {:hocon, github: "emqx/hocon", tag: "0.27.2", override: true}, {:emqx_http_lib, github: "emqx/emqx_http_lib", tag: "0.5.1", override: true}, {:esasl, github: "emqx/esasl", tag: "0.2.0"}, {:jose, github: "potatosalad/erlang-jose", tag: "1.11.2"}, diff --git a/rebar.config b/rebar.config index 1d5560405..336665540 100644 --- a/rebar.config +++ b/rebar.config @@ -66,7 +66,7 @@ , {system_monitor, {git, "https://github.com/ieQu1/system_monitor", {tag, "3.0.2"}}} , {getopt, "1.0.2"} , {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "0.18.0"}}} - , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.26.7"}}} + , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.27.2"}}} , {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.1"}}} , {esasl, {git, "https://github.com/emqx/esasl", {tag, "0.2.0"}}} , {jose, {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.2"}}}