From 5aceeff7b483213451bf28057d66c80a84813b89 Mon Sep 17 00:00:00 2001 From: ieQu1 <99872536+ieQu1@users.noreply.github.com> Date: Mon, 22 Aug 2022 15:14:30 +0200 Subject: [PATCH] refactor(cm_registry): Export transactions --- apps/emqx/src/emqx_cm_registry.erl | 7 ++++++- apps/emqx_gateway/src/emqx_gateway_cm_registry.erl | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/apps/emqx/src/emqx_cm_registry.erl b/apps/emqx/src/emqx_cm_registry.erl index 7049d31d5..ebd4b2977 100644 --- a/apps/emqx/src/emqx_cm_registry.erl +++ b/apps/emqx/src/emqx_cm_registry.erl @@ -44,6 +44,11 @@ code_change/3 ]). +%% Internal exports (RPC) +-export([ + do_cleanup_channels/1 +]). + -define(REGISTRY, ?MODULE). -define(TAB, emqx_channel_registry). -define(LOCK, {?MODULE, cleanup_down}). @@ -155,7 +160,7 @@ cleanup_channels(Node) -> global:trans( {?LOCK, self()}, fun() -> - mria:transaction(?CM_SHARD, fun do_cleanup_channels/1, [Node]) + mria:transaction(?CM_SHARD, fun ?MODULE:do_cleanup_channels/1, [Node]) end ). diff --git a/apps/emqx_gateway/src/emqx_gateway_cm_registry.erl b/apps/emqx_gateway/src/emqx_gateway_cm_registry.erl index 65532deaa..5c3e8bb45 100644 --- a/apps/emqx_gateway/src/emqx_gateway_cm_registry.erl +++ b/apps/emqx_gateway/src/emqx_gateway_cm_registry.erl @@ -42,6 +42,11 @@ code_change/3 ]). +%% Internal exports (RPC) +-export([ + do_cleanup_channels/2 +]). + -define(CM_SHARD, emqx_gateway_cm_shard). -define(LOCK, {?MODULE, cleanup_down}). @@ -148,7 +153,7 @@ cleanup_channels(Node, Name) -> global:trans( {?LOCK, self()}, fun() -> - mria:transaction(?CM_SHARD, fun do_cleanup_channels/2, [Node, Tab]) + mria:transaction(?CM_SHARD, fun ?MODULE:do_cleanup_channels/2, [Node, Tab]) end ).