Просмотр исходного кода

fix(hocon): start emqx failed using os env configs

Shawn 4 лет назад
Родитель
Сommit
7d66760c1e
3 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      .ci/docker-compose-file/conf.cluster.env
  2. 1 1
      apps/emqx/rebar.config
  3. 1 1
      rebar.config

+ 1 - 1
.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

+ 1 - 1
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"}}}

+ 1 - 1
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"}}}
     ]}.