From ef4c30b2fd510efb1ecf0843bb1a1405c953bfab Mon Sep 17 00:00:00 2001 From: x1001100011 Date: Sun, 18 Jul 2021 18:48:10 -0700 Subject: [PATCH] feat: set emqx in umbrella depend runtime false --- apps/emqx/mix.exs | 4 ++-- apps/emqx/src/emqx_app.erl | 6 +++--- apps/emqx_authentication/mix.exs | 2 +- apps/emqx_bridge_mqtt/mix.exs | 2 +- apps/emqx_coap/mix.exs | 2 +- apps/emqx_dashboard/mix.exs | 2 +- apps/emqx_lwm2m/mix.exs | 2 +- apps/emqx_management/mix.exs | 4 ++-- apps/emqx_psk_file/mix.exs | 2 +- apps/emqx_release_helper/lib/emqx_release_helper.ex | 3 ++- apps/emqx_resource/mix.exs | 2 +- apps/emqx_retainer/mix.exs | 4 +++- apps/emqx_rule_engine/mix.exs | 4 ++-- apps/emqx_stomp/mix.exs | 2 +- config/runtime.exs | 6 +----- 15 files changed, 23 insertions(+), 24 deletions(-) diff --git a/apps/emqx/mix.exs b/apps/emqx/mix.exs index 26ffb0624..509684b1e 100644 --- a/apps/emqx/mix.exs +++ b/apps/emqx/mix.exs @@ -19,7 +19,7 @@ defmodule EMQX.MixProject do def application do [ mod: {:emqx_app, []}, - extra_applications: [:logger] + extra_applications: [:logger, :os_mon, :syntax_tools] ] end @@ -29,7 +29,7 @@ defmodule EMQX.MixProject do {:recon, "~> 2.5"}, {:cowboy, github: "emqx/cowboy", tag: "2.8.2"}, {:esockd, github: "emqx/esockd", tag: "5.8.0"}, - {:ekka, github: "emqx/ekka", tag: "0.9.0"}, + {:ekka, github: "emqx/ekka", tag: "0.9.0", runtime: false}, {:gen_rpc, github: "emqx/gen_rpc", tag: "2.5.1"}, {:cuttlefish, github: "emqx/cuttlefish", tag: "v4.0.1"}, {:hocon, github: "emqx/hocon"}, diff --git a/apps/emqx/src/emqx_app.erl b/apps/emqx/src/emqx_app.erl index 234f42645..3041ca59d 100644 --- a/apps/emqx/src/emqx_app.erl +++ b/apps/emqx/src/emqx_app.erl @@ -46,9 +46,9 @@ start(_Type, _Args) -> ok = ekka_rlog:wait_for_shards(?EMQX_SHARDS, infinity), {ok, Sup} = emqx_sup:start_link(), ok = start_autocluster(), - ok = emqx_plugins:init(), - _ = emqx_plugins:load(), - _ = start_ce_modules(), + %% ok = emqx_plugins:init(), + %% _ = emqx_plugins:load(), + %% _ = start_ce_modules(), emqx_boot:is_enabled(listeners) andalso (ok = emqx_listeners:start()), register(emqx, self()), ok = emqx_alarm_handler:load(), diff --git a/apps/emqx_authentication/mix.exs b/apps/emqx_authentication/mix.exs index 04a872a53..64c709c76 100644 --- a/apps/emqx_authentication/mix.exs +++ b/apps/emqx_authentication/mix.exs @@ -25,7 +25,7 @@ defmodule EMQXAuthentication.MixProject do defp deps do [ - {:emqx, in_umbrella: true}, + {:emqx, in_umbrella: true, runtime: false}, {:jose, "~> 1.11"} ] end diff --git a/apps/emqx_bridge_mqtt/mix.exs b/apps/emqx_bridge_mqtt/mix.exs index 70b4c553c..05a8e0683 100644 --- a/apps/emqx_bridge_mqtt/mix.exs +++ b/apps/emqx_bridge_mqtt/mix.exs @@ -25,7 +25,7 @@ defmodule EMQXBridgeMqtt.MixProject do defp deps do [ - {:emqx, in_umbrella: true, override: true}, + {:emqx, in_umbrella: true, override: true, runtime: false}, {:emqx_rule_engine, in_umbrella: true}, {:emqtt, github: "emqx/emqtt", tag: "v1.2.3"} ] diff --git a/apps/emqx_coap/mix.exs b/apps/emqx_coap/mix.exs index 986914b30..01d00260d 100644 --- a/apps/emqx_coap/mix.exs +++ b/apps/emqx_coap/mix.exs @@ -25,7 +25,7 @@ defmodule EMQXCoap.MixProject do defp deps do [ - {:emqx, in_umbrella: true}, + {:emqx, in_umbrella: true, runtime: false}, {:gen_coap, github: "emqx/gen_coap", tag: "v0.3.2"} ] end diff --git a/apps/emqx_dashboard/mix.exs b/apps/emqx_dashboard/mix.exs index 6da67234c..5216ad8c0 100644 --- a/apps/emqx_dashboard/mix.exs +++ b/apps/emqx_dashboard/mix.exs @@ -26,7 +26,7 @@ defmodule EMQXDashboard.MixProject do defp deps do [ - {:emqx, in_umbrella: true}, + {:emqx, in_umbrella: true, runtime: false}, {:minirest, github: "emqx/minirest", tag: "0.3.5"} ] end diff --git a/apps/emqx_lwm2m/mix.exs b/apps/emqx_lwm2m/mix.exs index 6a270221f..2b45596d2 100644 --- a/apps/emqx_lwm2m/mix.exs +++ b/apps/emqx_lwm2m/mix.exs @@ -25,7 +25,7 @@ defmodule EMQXLwm2m.MixProject do defp deps do [ - {:emqx, in_umbrella: true}, + {:emqx, in_umbrella: true, runtime: false}, {:lwm2m_coap, github: "emqx/lwm2m-coap", tag: "v1.1.2"} ] end diff --git a/apps/emqx_management/mix.exs b/apps/emqx_management/mix.exs index 77bfed0a9..821a218cd 100644 --- a/apps/emqx_management/mix.exs +++ b/apps/emqx_management/mix.exs @@ -20,14 +20,14 @@ defmodule EMQXManagement.MixProject do [ registered: [:emqx_management_sup], mod: {:emqx_mgmt_app, []}, - extra_applications: [:logger] + extra_applications: [:logger, :syntax_tools] ] end defp deps do [ - {:emqx, in_umbrella: true}, {:emqx_rule_engine, in_umbrella: true}, + {:ekka, github: "emqx/ekka", tag: "0.9.0"}, {:minirest, github: "emqx/minirest", tag: "0.3.5"} ] end diff --git a/apps/emqx_psk_file/mix.exs b/apps/emqx_psk_file/mix.exs index ad89257ff..b7e6e4e7a 100644 --- a/apps/emqx_psk_file/mix.exs +++ b/apps/emqx_psk_file/mix.exs @@ -26,7 +26,7 @@ defmodule EMQXPskFile.MixProject do defp deps do [ - {:emqx, in_umbrella: true} + {:emqx, in_umbrella: true, runtime: false} ] end end diff --git a/apps/emqx_release_helper/lib/emqx_release_helper.ex b/apps/emqx_release_helper/lib/emqx_release_helper.ex index 9ed45566b..b9ad8e2b0 100644 --- a/apps/emqx_release_helper/lib/emqx_release_helper.ex +++ b/apps/emqx_release_helper/lib/emqx_release_helper.ex @@ -30,6 +30,7 @@ defmodule EmqxReleaseHelper do } end |> Map.merge(%{ + erts_vsn: :version |> :erlang.system_info() |> to_string(), project_path: EMQXUmbrella.MixProject.project_path(), enable_bcrypt: EMQXUmbrella.MixProject.enable_bcrypt(), enable_plugin_emqx_modules: false, @@ -69,7 +70,7 @@ defmodule EmqxReleaseHelper do platform_lib_dir: "lib", platform_log_dir: "log", platform_plugins_dir: "etc/plugins", - runner_root_dir: EMQXUmbrella.MixProject.project_path(), + runner_root_dir: "$(cd $(dirname $(readlink $0 || echo $0))/..; pwd -P)", runner_bin_dir: "$RUNNER_ROOT_DIR/bin", runner_etc_dir: "$RUNNER_ROOT_DIR/etc", runner_lib_dir: "$RUNNER_ROOT_DIR/lib", diff --git a/apps/emqx_resource/mix.exs b/apps/emqx_resource/mix.exs index 3c6197c27..df6139151 100644 --- a/apps/emqx_resource/mix.exs +++ b/apps/emqx_resource/mix.exs @@ -18,7 +18,7 @@ defmodule EMQXResource.MixProject do def application do [ mod: {:emqx_resource_app, []}, - extra_applications: [:logger] + extra_applications: [:logger, :syntax_tools] ] end diff --git a/apps/emqx_retainer/mix.exs b/apps/emqx_retainer/mix.exs index 2148f37fe..d74f42a99 100644 --- a/apps/emqx_retainer/mix.exs +++ b/apps/emqx_retainer/mix.exs @@ -25,6 +25,8 @@ defmodule EMQXRetainer.MixProject do end defp deps do - [{:emqx, in_umbrella: true}] + [ + {:emqx, in_umbrella: true, runtime: false} + ] end end diff --git a/apps/emqx_rule_engine/mix.exs b/apps/emqx_rule_engine/mix.exs index 1a6eab546..36ffe775c 100644 --- a/apps/emqx_rule_engine/mix.exs +++ b/apps/emqx_rule_engine/mix.exs @@ -20,13 +20,13 @@ defmodule EMQXRuleEngine.MixProject do [ registered: [:emqx_rule_engine_sup, :emqx_rule_registry], mod: {:emqx_rule_engine_app, []}, - extra_applications: [:logger] + extra_applications: [:logger, :syntax_tools] ] end defp deps do [ - {:emqx, in_umbrella: true}, + {:emqx, in_umbrella: true, runtime: false}, {:ekka, github: "emqx/ekka", tag: "0.9.0"} ] end diff --git a/apps/emqx_stomp/mix.exs b/apps/emqx_stomp/mix.exs index 2fab73fc4..84cd4d395 100644 --- a/apps/emqx_stomp/mix.exs +++ b/apps/emqx_stomp/mix.exs @@ -26,7 +26,7 @@ defmodule EMQXStomp.MixProject do defp deps do [ - {:emqx, in_umbrella: true} + {:emqx, in_umbrella: true, runtime: false} ] end end diff --git a/config/runtime.exs b/config/runtime.exs index 0258d97b0..ce6c2eb46 100644 --- a/config/runtime.exs +++ b/config/runtime.exs @@ -1,9 +1,5 @@ import Config -# import MyApplication.Hocon -# config :my_app, :key, :value +File.cwd! |> IO.inspect -# hocon :emqx, -# schema: :emqx_schema, -# config_file: "etc/emqx.conf" config :mnesia, dir: '/tmp/mnesia'