Merge pull request #7719 from zmstone/0421-pin-hocon-0.27.2
0421 pin hocon 0.27.2
This commit is contained in:
commit
fbf6c57d46
|
@ -29,7 +29,7 @@
|
||||||
{esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.1"}}},
|
{esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.1"}}},
|
||||||
{ekka, {git, "https://github.com/emqx/ekka", {tag, "0.12.3"}}},
|
{ekka, {git, "https://github.com/emqx/ekka", {tag, "0.12.3"}}},
|
||||||
{gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}},
|
{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"}}},
|
{pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}},
|
||||||
{recon, {git, "https://github.com/ferd/recon", {tag, "2.5.1"}}},
|
{recon, {git, "https://github.com/ferd/recon", {tag, "2.5.1"}}},
|
||||||
{snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "0.18.0"}}}
|
{snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "0.18.0"}}}
|
||||||
|
|
|
@ -129,13 +129,13 @@ get_i18n() ->
|
||||||
application:get_env(emqx_dashboard, i18n).
|
application:get_env(emqx_dashboard, i18n).
|
||||||
|
|
||||||
init_i18n(File, Lang) ->
|
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}).
|
application:set_env(emqx_dashboard, i18n, #{lang => atom_to_binary(Lang), cache => Cache}).
|
||||||
|
|
||||||
clear_i18n() ->
|
clear_i18n() ->
|
||||||
case application:get_env(emqx_dashboard, i18n) of
|
case application:get_env(emqx_dashboard, i18n) of
|
||||||
{ok, #{cache := Cache}} ->
|
{ok, #{cache := Cache}} ->
|
||||||
hocon_schema:delete_cache(Cache),
|
hocon_schema:delete_desc_cache(Cache),
|
||||||
application:unset_env(emqx_dashboard, i18n);
|
application:unset_env(emqx_dashboard, i18n);
|
||||||
undefined ->
|
undefined ->
|
||||||
ok
|
ok
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
[ {emqx, {path, "../emqx"}},
|
[ {emqx, {path, "../emqx"}},
|
||||||
%% FIXME: tag this as v3.1.3
|
%% FIXME: tag this as v3.1.3
|
||||||
{prometheus, {git, "https://github.com/deadtrickster/prometheus.erl", {tag, "v4.8.1"}}},
|
{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}]}.
|
{edoc_opts, [{preprocess, true}]}.
|
||||||
|
|
10
bin/emqx.cmd
10
bin/emqx.cmd
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
@set script=%~n0
|
@set script=%~n0
|
||||||
|
|
||||||
:: for remote_console
|
:: for attach and remote_console
|
||||||
@set EPMD_ARG=-start_epmd false -epmd_module ekka_epmd -proto_dist ekka
|
@set EPMD_ARG=-start_epmd false -epmd_module ekka_epmd -proto_dist ekka
|
||||||
:: for erl command
|
:: for erl command
|
||||||
@set ERL_FLAGS=%EPMD_ARG%
|
@set ERL_FLAGS=%EPMD_ARG%
|
||||||
|
@ -65,6 +65,9 @@
|
||||||
@set HOCON_ENV_OVERRIDE_PREFIX=EMQX_
|
@set HOCON_ENV_OVERRIDE_PREFIX=EMQX_
|
||||||
@set node_type=-name
|
@set node_type=-name
|
||||||
@set schema_mod=emqx_conf_schema
|
@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"
|
@set conf_path="%etc_dir%\emqx.conf"
|
||||||
:: Extract node name from emqx.conf
|
:: Extract node name from emqx.conf
|
||||||
|
@ -212,8 +215,7 @@ cd /d "%rel_root_dir%"
|
||||||
@echo off
|
@echo off
|
||||||
cd /d %rel_root_dir%
|
cd /d %rel_root_dir%
|
||||||
@echo on
|
@echo on
|
||||||
@start "%rel_name% console" %werl% -mode embedded -boot "%boot_file_name%" %args%
|
%erl_exe% -mode embedded -boot "%boot_file_name%" %args%
|
||||||
@echo emqx is started!
|
|
||||||
@goto :eof
|
@goto :eof
|
||||||
|
|
||||||
:: Ping the running node
|
:: Ping the running node
|
||||||
|
@ -234,7 +236,7 @@ cd /d %rel_root_dir%
|
||||||
|
|
||||||
:: Attach to a running node
|
:: Attach to a running node
|
||||||
:attach
|
: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
|
@goto :eof
|
||||||
|
|
||||||
:: Trim variable
|
:: Trim variable
|
||||||
|
|
2
mix.exs
2
mix.exs
|
@ -68,7 +68,7 @@ defmodule EMQXUmbrella.MixProject do
|
||||||
# in conflict by emqtt and hocon
|
# in conflict by emqtt and hocon
|
||||||
{:getopt, "1.0.2", override: true},
|
{:getopt, "1.0.2", override: true},
|
||||||
{:snabbkaffe, github: "kafka4beam/snabbkaffe", tag: "0.18.0", 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},
|
{:emqx_http_lib, github: "emqx/emqx_http_lib", tag: "0.5.1", override: true},
|
||||||
{:esasl, github: "emqx/esasl", tag: "0.2.0"},
|
{:esasl, github: "emqx/esasl", tag: "0.2.0"},
|
||||||
{:jose, github: "potatosalad/erlang-jose", tag: "1.11.2"},
|
{:jose, github: "potatosalad/erlang-jose", tag: "1.11.2"},
|
||||||
|
|
|
@ -66,7 +66,7 @@
|
||||||
, {system_monitor, {git, "https://github.com/ieQu1/system_monitor", {tag, "3.0.2"}}}
|
, {system_monitor, {git, "https://github.com/ieQu1/system_monitor", {tag, "3.0.2"}}}
|
||||||
, {getopt, "1.0.2"}
|
, {getopt, "1.0.2"}
|
||||||
, {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "0.18.0"}}}
|
, {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"}}}
|
, {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"}}}
|
, {esasl, {git, "https://github.com/emqx/esasl", {tag, "0.2.0"}}}
|
||||||
, {jose, {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.2"}}}
|
, {jose, {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.2"}}}
|
||||||
|
|
Loading…
Reference in New Issue