diff --git a/apps/emqx_modules/src/emqx_topic_metrics_api.erl b/apps/emqx_modules/src/emqx_topic_metrics_api.erl index b216fe44b..74a37b652 100644 --- a/apps/emqx_modules/src/emqx_topic_metrics_api.erl +++ b/apps/emqx_modules/src/emqx_topic_metrics_api.erl @@ -238,10 +238,8 @@ fields(metrics) -> NKey = binary_to_atom(list_to_binary(Str), utf8), ?DESC(NKey) end, - [{Key, mk(integer(), #{desc => ToDesc(Key), example => 0})} || Key <- Integers] - ++ - [{Key, mk(number(), #{desc => ToDesc(Key), example => 0})} || Key <- Numbers]. - + [{Key, mk(integer(), #{desc => ToDesc(Key), example => 0})} || Key <- Integers] ++ + [{Key, mk(number(), #{desc => ToDesc(Key), example => 0})} || Key <- Numbers]. topic(In) -> Desc = diff --git a/lib-ee/emqx_license/include/emqx_license.hrl b/lib-ee/emqx_license/include/emqx_license.hrl index 5cc7c6df0..f67c63577 100644 --- a/lib-ee/emqx_license/include/emqx_license.hrl +++ b/lib-ee/emqx_license/include/emqx_license.hrl @@ -11,7 +11,7 @@ "\n" "========================================================================\n" "Using an evaluation license limited to ~p concurrent connections.\n" - "Apply a license at https://emqx.com/apply-licenses/emqx.\n" + "Apply for a license at https://emqx.com/apply-licenses/emqx.\n" "Or contact EMQ customer services.\n" "========================================================================\n" ). @@ -20,7 +20,7 @@ "\n" "========================================================================\n" "License has been expired for ~p days.\n" - "Apply a new license at https://emqx.com/apply-licenses/emqx.\n" + "Apply for a new license at https://emqx.com/apply-licenses/emqx.\n" "Or contact EMQ customer services.\n" "========================================================================\n" ). diff --git a/lib-ee/emqx_license/src/emqx_license_checker.erl b/lib-ee/emqx_license/src/emqx_license_checker.erl index 161e5a9cf..473ca0965 100644 --- a/lib-ee/emqx_license/src/emqx_license_checker.erl +++ b/lib-ee/emqx_license/src/emqx_license_checker.erl @@ -11,7 +11,16 @@ -define(CHECK_INTERVAL, 5000). -define(EXPIRY_ALARM_CHECK_INTERVAL, 24 * 60 * 60). --define(OK(EXPR), try _ = begin EXPR end, ok catch _:_ -> ok end). +-define(OK(EXPR), + try + _ = begin + EXPR + end, + ok + catch + _:_ -> ok + end +). -export([ start_link/1,