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

Merge pull request #14052 from qzhuyan/fix/william/mem-usage

William Yang 1 год назад
Родитель
Сommit
adefbfd3e9
4 измененных файлов с 7 добавлено и 3 удалено
  1. 1 1
      apps/emqx/rebar.config
  2. 3 0
      changes/ce/fix-14052.en.md
  3. 2 1
      mix.exs
  4. 1 1
      rebar.config

+ 1 - 1
apps/emqx/rebar.config

@@ -25,7 +25,7 @@
     {emqx_utils, {path, "../emqx_utils"}},
     {emqx_durable_storage, {path, "../emqx_durable_storage"}},
     {emqx_ds_backends, {path, "../emqx_ds_backends"}},
-    {lc, {git, "https://github.com/emqx/lc.git", {tag, "0.3.2"}}},
+    {lc, {git, "https://github.com/emqx/lc.git", {tag, "0.3.3"}}},
     {gproc, {git, "https://github.com/emqx/gproc", {tag, "0.9.0.1"}}},
     {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.2"}}},
     {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.12.0"}}},

+ 3 - 0
changes/ce/fix-14052.en.md

@@ -0,0 +1,3 @@
+Corrected reading mem usage from cgroup if in use.
+
+

+ 2 - 1
mix.exs

@@ -186,7 +186,7 @@ defmodule EMQXUmbrella.MixProject do
   def common_dep(:esockd), do: {:esockd, github: "emqx/esockd", tag: "5.12.0", override: true}
   def common_dep(:gproc), do: {:gproc, github: "emqx/gproc", tag: "0.9.0.1", override: true}
   def common_dep(:hocon), do: {:hocon, github: "emqx/hocon", tag: "0.43.4", override: true}
-  def common_dep(:lc), do: {:lc, github: "emqx/lc", tag: "0.3.2", override: true}
+  def common_dep(:lc), do: {:lc, github: "emqx/lc", tag: "0.3.3", override: true}
   # in conflict by ehttpc and emqtt
   def common_dep(:gun), do: {:gun, github: "emqx/gun", tag: "1.3.11", override: true}
   # in conflict by cowboy_swagger and cowboy
@@ -625,6 +625,7 @@ defmodule EMQXUmbrella.MixProject do
         [
           applications: applications(release_type, edition_type),
           skip_mode_validation_for: [
+            :lc,
             :emqx_mix,
             :emqx_machine,
             :emqx_gateway,

+ 1 - 1
rebar.config

@@ -72,7 +72,7 @@
 {post_hooks, []}.
 
 {deps, [
-    {lc, {git, "https://github.com/emqx/lc.git", {tag, "0.3.2"}}},
+    {lc, {git, "https://github.com/emqx/lc.git", {tag, "0.3.3"}}},
     {redbug, {git, "https://github.com/emqx/redbug", {tag, "2.0.10"}}},
     {gpb, "4.19.9"},
     {typerefl, {git, "https://github.com/ieQu1/typerefl", {tag, "0.9.1"}}},