feat: fix runtime issues after merge master

This commit is contained in:
x1001100011 2021-10-28 20:04:41 -07:00
parent 0f57fb9599
commit 23d72b334e
4 changed files with 59 additions and 62 deletions

View File

@ -27,7 +27,7 @@ defmodule EMQXManagement.MixProject do
defp deps do defp deps do
[ [
{:emqx_rule_engine, in_umbrella: true}, {:emqx_rule_engine, in_umbrella: true},
{:ekka, github: "emqx/ekka", tag: "0.11.1"}, {:ekka, github: "emqx/ekka", tag: "0.11.1", runtime: false},
{:emqx_http_lib, github: "emqx/emqx_http_lib", tag: "0.2.1"}, {:emqx_http_lib, github: "emqx/emqx_http_lib", tag: "0.2.1"},
{:minirest, github: "emqx/minirest", tag: "1.2.4"} {:minirest, github: "emqx/minirest", tag: "1.2.4"}
] ]

View File

@ -12,19 +12,35 @@ defmodule EmqxReleaseHelper.Applications do
end end
end end
application :emqx_machine do application :emqx_conf do
start_type :load
overlay do
template "etc/emqx.conf.all", "etc/emqx.conf"
end
end
application :lc do
start_type :load start_type :load
end end
application :emqx_bridge do application :esasl do
start_type :load start_type :load
end end
application :emqx_auto_subscribe do application :mria do
start_type :load start_type :load
end end
application :emqx_exhook do application :mnesia do
start_type :load
end
application :ekka do
start_type :load
end
application :emqx_plugin_libs do
start_type :load start_type :load
end end
@ -36,19 +52,15 @@ defmodule EmqxReleaseHelper.Applications do
end end
end end
application :emqx_connector do
start_type :load
end
application :emqx_modules do
start_type :load
end
application :emqx_resource do application :emqx_resource do
start_type :load start_type :load
end end
application :emqx_plugin_libs do application :emqx_connector do
start_type :load
end
application :emqx_bridge do
start_type :load start_type :load
end end
@ -64,79 +76,63 @@ defmodule EmqxReleaseHelper.Applications do
end end
end end
application :emqx_machine do
start_type :permanent
end
application :emqx_auto_subscribe do
start_type :permanent
end
application :emqx_exhook do
start_type :permanent
end
application :emqx_modules do
start_type :permanent
end
application :emqx_dashboard do application :emqx_dashboard do
start_type :load start_type :permanent
end end
application :emqx_management do application :emqx_management do
start_type :load start_type :permanent
end end
application :emqx_statsd do application :emqx_statsd do
start_type :load start_type :permanent
end end
application :emqx_retainer do application :emqx_retainer do
start_type :load start_type :permanent
end end
application :emqx_rule_engine do application :emqx_rule_engine do
start_type :load start_type :permanent
end end
application :emqx_psk do application :emqx_psk do
start_type :load start_type :permanent
end end
application :emqx_limiter do application :emqx_limiter do
start_type :load start_type :permanent
end end
application :emqx_conf do application :emqx_prometheus do
start_type :load start_type :permanent
overlay do
template "etc/emqx.conf.all", "etc/emqx.conf"
end
end
application :emqx_prometheus, %{release_type: :cloud} do
start_type :load
end end
application :bcrypt, %{enable_bcrypt: true, release_type: :cloud} do application :bcrypt, %{enable_bcrypt: true, release_type: :cloud} do
start_type :permanent start_type :permanent
end end
application :gproc do
start_type :load
end
application :grpc do
start_type :load
end
application :ekka do
start_type :load
end
application :mria do
start_type :load
end
application :mnesia do
start_type :load
end
application :ecpool do
start_type :load
end
application :lc do
start_type :load
end
application :xmerl, %{release_type: :cloud} do application :xmerl, %{release_type: :cloud} do
start_type :permanent start_type :permanent
end end
application :observer, %{release_type: :cloud} do
start_type :load
end
end end

View File

@ -26,7 +26,8 @@ defmodule EMQXResource.MixProject do
[ [
{:jsx, "3.1.0"}, {:jsx, "3.1.0"},
{:gproc, "0.9.0"}, {:gproc, "0.9.0"},
{:hocon, github: "emqx/hocon"} {:hocon, github: "emqx/hocon"},
{:emqx_conf, in_umbrella: true}
] ]
end end
end end

View File

@ -27,8 +27,8 @@ defmodule EMQXRuleEngine.MixProject do
defp deps do defp deps do
[ [
{:emqx, in_umbrella: true, runtime: false}, {:emqx, in_umbrella: true, runtime: false},
{:emqx_http_lib, github: "emqx/emqx_http_lib", tag: "0.2.1"}, {:ekka, github: "emqx/ekka", tag: "0.11.1", runtime: false},
{:ekka, github: "emqx/ekka", tag: "0.11.1"} {:emqx_http_lib, github: "emqx/emqx_http_lib", tag: "0.2.1"}
] ]
end end
end end