From ca5637b4a3dba8f3599cf2bfcdc7087a2f7a3c23 Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 9 Mar 2022 10:57:29 +0100 Subject: [PATCH 1/2] fix: update mongodb client to include deadloop fix --- apps/emqx_auth_mongo/rebar.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx_auth_mongo/rebar.config b/apps/emqx_auth_mongo/rebar.config index 78442c00b..c89c15d3c 100644 --- a/apps/emqx_auth_mongo/rebar.config +++ b/apps/emqx_auth_mongo/rebar.config @@ -1,6 +1,6 @@ {deps, %% NOTE: mind poolboy version when updating mongodb-erlang version - [{mongodb, {git,"https://github.com/emqx/mongodb-erlang", {tag, "v3.0.10"}}}, + [{mongodb, {git,"https://github.com/emqx/mongodb-erlang", {tag, "v3.0.12"}}}, %% mongodb-erlang uses a special fork https://github.com/comtihon/poolboy.git %% (which has overflow_ttl feature added). %% However, it references `{branch, "master}` (commit 9c06a9a on 2021-04-07). From cedeff4dab699ee2f1104272f68b24bc2614b373 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Wed, 9 Mar 2022 11:18:02 +0100 Subject: [PATCH 2/2] build(appup): fix module delete instructions when there is a application_restart instruction, there is no need to add module delete instructions --- scripts/update_appup.escript | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/update_appup.escript b/scripts/update_appup.escript index 19b546f43..9083b62f1 100755 --- a/scripts/update_appup.escript +++ b/scripts/update_appup.escript @@ -272,8 +272,9 @@ do_merge_update_actions(App, {New0, Changed0, Deleted0}, OldActions) -> New = New0 -- AlreadyHandled, Changed = Changed0 -- AlreadyHandled, Deleted = Deleted0 -- AlreadyHandled, + HasRestart = contains_restart_application(App, OldActions), Actions = - case contains_restart_application(App, OldActions) of + case HasRestart of true -> []; false -> @@ -285,7 +286,12 @@ do_merge_update_actions(App, {New0, Changed0, Deleted0}, OldActions) -> OldActionsWithStop ++ Actions ++ OldActionsAfterStop ++ - [{delete_module, M} || M <- Deleted] ++ + case HasRestart of + true -> + []; + false -> + [{delete_module, M} || M <- Deleted] + end ++ AppSpecific. %% If an entry restarts an application, there's no need to use