feat: fix runtime issues after merge master

apps/emqx/mix.exs

@@ -29,7 +29,7 @@ defmodule EMQX.MixProject do
       {:recon, "2.5.2"},
       {:cowboy, github: "emqx/cowboy", tag: "2.8.2"},
       {:esockd, github: "emqx/esockd", tag: "5.8.0"},
-      {:ekka, github: "emqx/ekka", tag: "0.10.8"},
+      {:ekka, github: "emqx/ekka", tag: "0.11.1"},
       {:gen_rpc, github: "emqx/gen_rpc", tag: "2.5.1"},
       {:cuttlefish, github: "emqx/cuttlefish", tag: "v4.0.1"},
       {:hocon, github: "emqx/hocon"},

apps/emqx_conf/mix.exs

@@ -0,0 +1,32 @@
+defmodule EMQXConf.MixProject do
+  use Mix.Project
+
+  def project do
+    [
+      app: :emqx_conf,
+      version: "0.1.0",
+      build_path: "../../_build",
+      config_path: "../../config/config.exs",
+      deps_path: "../../deps",
+      lockfile: "../../mix.lock",
+      elixir: "~> 1.12",
+      start_permanent: Mix.env() == :prod,
+      deps: deps(),
+      description: "EMQ X Configuration Management"
+    ]
+  end
+
+  def application do
+    [
+      mod: {:emqx_conf_app, []},
+      extra_applications: [:logger, :os_mon, :syntax_tools]
+    ]
+  end
+
+  defp deps do
+    [
+      {:emqx, in_umbrella: true, runtime: false},
+      {:hocon, github: "emqx/hocon"}
+    ]
+  end
+end

apps/emqx_management/mix.exs

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

apps/emqx_release_helper/lib/emqx_release_helper/applications.ex

@@ -13,11 +13,7 @@ defmodule EmqxReleaseHelper.Applications do
   end
 
   application :emqx_machine do
-    start_type :permanent
-
-    overlay do
-      template "etc/emqx.conf.all", "etc/emqx.conf"
-    end
+    start_type :load
   end
 
   application :emqx_bridge do
@@ -93,7 +89,15 @@ defmodule EmqxReleaseHelper.Applications do
   end
 
   application :emqx_limiter do
-    start_type :permanent
+    start_type :load
+  end
+
+  application :emqx_conf do
+    start_type :load
+
+    overlay do
+      template "etc/emqx.conf.all", "etc/emqx.conf"
+    end
   end
 
   application :emqx_prometheus, %{release_type: :cloud} do
@@ -116,6 +120,10 @@ defmodule EmqxReleaseHelper.Applications do
     start_type :load
   end
 
+  application :mria do
+    start_type :load
+  end
+
   application :mnesia do
     start_type :load
   end

apps/emqx_rule_engine/mix.exs

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

mix.exs

@@ -16,7 +16,7 @@ defmodule EMQXUmbrella.MixProject do
       {:jiffy, github: "emqx/jiffy", tag: "1.0.5", override: true},
       {:jsx, "~> 3.1", override: true},
       {:gun, github: "emqx/gun", tag: "1.3.4", override: true},
-      {:hocon, github: "emqx/hocon", tag: "0.19.0", override: true},
+      {:hocon, github: "emqx/hocon", tag: "0.20.5", override: true},
       {:cuttlefish,
        github: "emqx/cuttlefish",
        manager: :rebar3,

mix.lock

@@ -4,10 +4,10 @@
   "cowboy": {:git, "https://github.com/emqx/cowboy.git", "b89d4689a04149b1a4a3641280aa5c5643f921b2", [tag: "2.8.2"]},
   "cowboy_swagger": {:git, "https://github.com/inaka/cowboy_swagger", "f4b49a4f289a9ee9ae1ff35772c4e191b5fafbd5", [tag: "2.4.0"]},
   "cowlib": {:hex, :cowlib, "2.11.0", "0b9ff9c346629256c42ebe1eeb769a83c6cb771a6ee5960bd110ab0b9b872063", [:make, :rebar3], [], "hexpm", "2b3e9da0b21c4565751a6d4901c20d1b4cc25cbb7fd50d91d2ab6dd287bc86a9"},
-  "cuttlefish": {:git, "https://github.com/emqx/cuttlefish.git", "1b95e3aa275fc240dd51f53e771566b1f89b5fcc", []},
+  "cuttlefish": {:git, "https://github.com/emqx/cuttlefish.git", "6c346563e89ebbd95dbc1c29017adaf9abf85ca1", []},
   "ecpool": {:git, "https://github.com/emqx/ecpool.git", "0516d2cebd14654ef8c583c347e4a0b01363b86d", [tag: "0.5.1"]},
   "eetcd": {:hex, :eetcd, "0.3.4", "27e8b4775230c53a9ef602f62a1603591302b40b2eb195d567edffb35b6cf1a2", [:rebar3], [{:gun, "1.3.3", [hex: :gun, repo: "hexpm", optional: false]}], "hexpm", "b763c0e1a9741d39a62f5a19186a342863eacbc769151c4e81db5790efecefca"},
-  "ekka": {:git, "https://github.com/emqx/ekka.git", "80e7439472164ce2b121cff523b979291cc7c9f3", [tag: "0.10.8"]},
+  "ekka": {:git, "https://github.com/emqx/ekka.git", "005fd6bb94199dc2ecb4ba03284f253b408e02d9", [tag: "0.11.1"]},
   "emqtt": {:git, "https://github.com/emqx/emqtt.git", "25892ef48a979a9dfbd74d86133cb28cf11f3cf4", [tag: "1.4.3"]},
   "emqx_http_lib": {:git, "https://github.com/emqx/emqx_http_lib.git", "9a1aafcbad1bb35392ebabc0cf102c7bce660432", [tag: "0.4.0"]},
   "epgsql": {:git, "https://github.com/epgsql/epgsql.git", "895c8f9d53f08d09ec6a0301c56d3d6f270929f2", [tag: "4.4.0"]},
@@ -21,13 +21,14 @@
   "gproc": {:hex, :gproc, "0.9.0", "853ccb7805e9ada25d227a157ba966f7b34508f386a3e7e21992b1b484230699", [:rebar3], [], "hexpm", "587e8af698ccd3504cf4ba8d90f893ede2b0f58cabb8a916e2bf9321de3cf10b"},
   "grpc": {:git, "https://github.com/emqx/grpc-erl.git", "f8ba39eb075fb2a7f370563045d5e5d0914f2703", [tag: "0.6.2"]},
   "gun": {:git, "https://github.com/emqx/gun.git", "e1b5e14139e2a936ad6561bf960f70f1e80b81e2", [tag: "1.3.4"]},
-  "hocon": {:git, "https://github.com/emqx/hocon.git", "e660671bdd01928e7bfd15bbc9bfd14656ad742e", [tag: "0.19.0"]},
+  "hocon": {:git, "https://github.com/emqx/hocon.git", "2021a1b82c1f654c98181ba2dbfec5457c5c6eb7", [tag: "0.20.5"]},
   "jiffy": {:git, "https://github.com/emqx/jiffy.git", "baa1f4e750ae3c5c9e54f9c2e52280b7fc24a8d9", [tag: "1.0.5"]},
   "jose": {:hex, :jose, "1.11.2", "f4c018ccf4fdce22c71e44d471f15f723cb3efab5d909ab2ba202b5bf35557b3", [:mix, :rebar3], [], "hexpm", "98143fbc48d55f3a18daba82d34fe48959d44538e9697c08f34200fa5f0947d2"},
   "jsx": {:hex, :jsx, "3.1.0", "d12516baa0bb23a59bb35dccaf02a1bd08243fcbb9efe24f2d9d056ccff71268", [:rebar3], [], "hexpm", "0c5cc8fdc11b53cc25cf65ac6705ad39e54ecc56d1c22e4adb8f5a53fb9427f3"},
   "lc": {:git, "https://github.com/qzhuyan/lc.git", "6f38a748af0993bb4e440a0f9223d6aa7b90b86b", [tag: "0.1.1"]},
   "lwm2m_coap": {:git, "https://github.com/emqx/lwm2m-coap.git", "495f3c62fae153040c89f9a0ba5344789ff5acc8", [tag: "v2.0.0"]},
   "minirest": {:git, "https://github.com/emqx/minirest.git", "60c1a5a1f5df00a662cb34cf4101c7a21ffe08f9", [tag: "1.2.4"]},
+  "mria": {:git, "https://github.com/emqx/mria", "f0efc591339f960b5126ec4e1a0fed85d1578eb5", [tag: "0.1.2"]},
   "mysql": {:git, "https://github.com/emqx/mysql-otp.git", "bdabac44cc8836a9e23897b7e1b77c7df7e04f70", [tag: "1.7.1"]},
   "pbkdf2": {:git, "https://github.com/emqx/erlang-pbkdf2.git", "45d9981209ea07a83a58cf85aaf8236457da4342", [tag: "2.0.4"]},
   "poolboy": {:git, "https://github.com/emqx/poolboy.git", "29be47db8c2be38b18c908e43a80ebb7b9b6116b", [tag: "1.5.2"]},

rel/overlays/bin/emqx

@@ -29,7 +29,7 @@ export RUNNER_ROOT_DIR
 export RUNNER_ETC_DIR
 export ERTS_VSN
 
-export SCHEMA_MOD=emqx_machine_schema
+export SCHEMA_MOD=emqx_conf_schema
 export CONFIGS_DIR="$RUNNER_DATA_DIR/configs"
 export MNESIA_DATA_DIR="$RUNNER_DATA_DIR/mnesia"