From 7d66760c1ecc58fb685fae5713a7c5d2a6770952 Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Thu, 15 Jul 2021 11:55:31 +0800 Subject: [PATCH] fix(hocon): start emqx failed using os env configs --- .ci/docker-compose-file/conf.cluster.env | 2 +- apps/emqx/rebar.config | 2 +- rebar.config | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/docker-compose-file/conf.cluster.env b/.ci/docker-compose-file/conf.cluster.env index d8294a785..be3cc71ac 100644 --- a/.ci/docker-compose-file/conf.cluster.env +++ b/.ci/docker-compose-file/conf.cluster.env @@ -1,6 +1,6 @@ EMQX_NAME=emqx EMQX_CLUSTER__DISCOVERY=static -EMQX_CLUSTER__STATIC__SEEDS="emqx@node1.emqx.io, emqx@node2.emqx.io" +EMQX_CLUSTER__STATIC__SEEDS="[emqx@node1.emqx.io, emqx@node2.emqx.io]" EMQX_LISTENER__TCP__EXTERNAL__PROXY_PROTOCOL=on EMQX_LISTENER__WS__EXTERNAL__PROXY_PROTOCOL=on EMQX_LOG__LEVEL=debug diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config index 68463778d..99cca64d6 100644 --- a/apps/emqx/rebar.config +++ b/apps/emqx/rebar.config @@ -16,7 +16,7 @@ , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.10.2"}}} , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.5.1"}}} , {cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v4.0.1"}}} %% todo delete when plugins use hocon - , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.9.6"}}} + , {hocon, {git, "https://github.com/emqx/hocon.git", {branch, "parse_error_crash"}}} , {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.13.0"}}} diff --git a/rebar.config b/rebar.config index 3e7b9be01..b965c8fba 100644 --- a/rebar.config +++ b/rebar.config @@ -61,7 +61,7 @@ , {observer_cli, "1.6.1"} % NOTE: depends on recon 2.5.1 , {getopt, "1.0.1"} , {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "0.13.0"}}} - , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.9.6"}}} + , {hocon, {git, "https://github.com/emqx/hocon.git", {branch, "parse_error_crash"}}} , {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.2.1"}}} ]}.