From 73711d41476b01e0fc8f4081b4224e676d58a7b7 Mon Sep 17 00:00:00 2001 From: Zhongwen Deng Date: Fri, 17 Jun 2022 00:08:03 +0800 Subject: [PATCH 1/2] fix: brutal kill emqx_dashboard_listener --- apps/emqx_dashboard/src/emqx_dashboard_sup.erl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/emqx_dashboard/src/emqx_dashboard_sup.erl b/apps/emqx_dashboard/src/emqx_dashboard_sup.erl index 89231fadf..4482d4b9f 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard_sup.erl +++ b/apps/emqx_dashboard/src/emqx_dashboard_sup.erl @@ -22,7 +22,7 @@ -export([init/1]). --define(CHILD(I), {I, {I, start_link, []}, permanent, 5000, worker, [I]}). +-define(CHILD(I, ShutDown), {I, {I, start_link, []}, permanent, ShutDown, worker, [I]}). start_link() -> supervisor:start_link({local, ?MODULE}, ?MODULE, []). @@ -30,7 +30,7 @@ start_link() -> init([]) -> {ok, {{one_for_one, 5, 100}, [ - ?CHILD(emqx_dashboard_listener), - ?CHILD(emqx_dashboard_token), - ?CHILD(emqx_dashboard_monitor) + ?CHILD(emqx_dashboard_listener, brutal_kill), + ?CHILD(emqx_dashboard_token, 5000), + ?CHILD(emqx_dashboard_monitor, 5000) ]}}. From f1ca88741c8660741858e75d1f40098d9635a394 Mon Sep 17 00:00:00 2001 From: Zhongwen Deng Date: Fri, 17 Jun 2022 00:10:36 +0800 Subject: [PATCH 2/2] fix: bump minirest to 1.3.5(pmap api_spec crash log) --- mix.exs | 2 +- rebar.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mix.exs b/mix.exs index a681f7d29..febf5d4d7 100644 --- a/mix.exs +++ b/mix.exs @@ -54,7 +54,7 @@ defmodule EMQXUmbrella.MixProject do {:esockd, github: "emqx/esockd", tag: "5.9.3", override: true}, {:ekka, github: "emqx/ekka", tag: "0.13.0", override: true}, {:gen_rpc, github: "emqx/gen_rpc", tag: "2.8.1", override: true}, - {:minirest, github: "emqx/minirest", tag: "1.3.4", override: true}, + {:minirest, github: "emqx/minirest", tag: "1.3.5", override: true}, {:ecpool, github: "emqx/ecpool", tag: "0.5.2"}, {:replayq, "0.3.4", override: true}, {:pbkdf2, github: "emqx/erlang-pbkdf2", tag: "2.0.4", override: true}, diff --git a/rebar.config b/rebar.config index 6f1ec259b..e928e2447 100644 --- a/rebar.config +++ b/rebar.config @@ -56,7 +56,7 @@ , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.3"}}} , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.13.0"}}} , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}} - , {minirest, {git, "https://github.com/emqx/minirest", {tag, "1.3.4"}}} + , {minirest, {git, "https://github.com/emqx/minirest", {tag, "1.3.5"}}} , {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.2"}}} , {replayq, "0.3.4"} , {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}}