From 793add021983ac861b560b76b0b8cd0f3a85fc08 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Fri, 25 Mar 2022 08:21:50 +0100 Subject: [PATCH] style: use a macro for 'catch' --- .../emqx_license/src/emqx_license_resources.erl | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/lib-ee/emqx_license/src/emqx_license_resources.erl b/lib-ee/emqx_license/src/emqx_license_resources.erl index d9ace41f0..96300d60b 100644 --- a/lib-ee/emqx_license/src/emqx_license_resources.erl +++ b/lib-ee/emqx_license/src/emqx_license_resources.erl @@ -27,6 +27,17 @@ code_change/3 ]). +-define(OK(EXPR), + (fun() -> + try + _ = EXPR, + ok + catch + _:_ -> ok + end + end)() +). + %%------------------------------------------------------------------------------ %% API %%------------------------------------------------------------------------------ @@ -90,11 +101,9 @@ connection_quota_early_alarm({ok, #{max_connections := Max}}) when is_integer(Ma Message = iolist_to_binary([ "License: live connection number exceeds ", HighPercent, "%" ]), - catch emqx_alarm:activate(license_quota, #{high_watermark => HighPercent}, Message) + ?OK(emqx_alarm:activate(license_quota, #{high_watermark => HighPercent}, Message)) end, - Count < Max * Low andalso - catch emqx_alarm:deactivate(license_quota), - ok; + Count < Max * Low andalso ?OK(emqx_alarm:deactivate(license_quota)); connection_quota_early_alarm(_Limits) -> ok.