yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(emqx_limiter_schema): use typerefl alias

This commit is contained in:
Zaiming (Stone) Shi 2023-11-08 19:43:56 +01:00
parent d603de10e6
commit 8a4fba431e
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
apps/emqx/src/emqx_limiter/src/emqx_limiter_schema.erl
View File

@ -33,7 +33,8 @@
desc/1, desc/1,
types/0, types/0,
short_paths/0, short_paths/0,
short_paths_fields/0 short_paths_fields/0,
rate_type/0
]). ]).
-define(KILOBYTE, 1024). -define(KILOBYTE, 1024).
@ -129,9 +130,9 @@ fields(limiter) ->
]; ];
fields(node_opts) -> fields(node_opts) ->
[ [
{rate, ?HOCON(rate(), #{desc => deprecated_desc(rate), default => <<"infinity">>})}, {rate, ?HOCON(rate_type(), #{desc => deprecated_desc(rate), default => <<"infinity">>})},
{burst, {burst,
?HOCON(burst_rate(), #{ ?HOCON(burst_rate_type(), #{
desc => deprecated_desc(burst), desc => deprecated_desc(burst),
default => <<"0">> default => <<"0">>
})} })}
@ -142,7 +143,7 @@ fields(bucket_opts) ->
fields_of_bucket(<<"infinity">>); fields_of_bucket(<<"infinity">>);
fields(client_opts) -> fields(client_opts) ->
[ [
{rate, ?HOCON(rate(), #{default => <<"infinity">>, desc => deprecated_desc(rate)})}, {rate, ?HOCON(rate_type(), #{default => <<"infinity">>, desc => deprecated_desc(rate)})},
{initial, {initial,
?HOCON(initial(), #{ ?HOCON(initial(), #{
default => <<"0">>, default => <<"0">>,
@ -164,7 +165,7 @@ fields(client_opts) ->
} }
)}, )},
{burst, {burst,
?HOCON(burst(), #{ ?HOCON(burst_type(), #{
desc => deprecated_desc(burst), desc => deprecated_desc(burst),
default => <<"0">>, default => <<"0">>,
importance => ?IMPORTANCE_HIDDEN, importance => ?IMPORTANCE_HIDDEN,
@ -211,7 +212,7 @@ short_paths_fields() ->
short_paths_fields(Importance) -> short_paths_fields(Importance) ->
[ [
{Name, {Name,
?HOCON(rate(), #{ ?HOCON(rate_type(), #{
desc => ?DESC(Name), desc => ?DESC(Name),
required => false, required => false,
importance => Importance, importance => Importance,
@ -415,7 +416,7 @@ composite_bucket_fields(Types, ClientRef) ->
fields_of_bucket(Default) -> fields_of_bucket(Default) ->
[ [
{rate, ?HOCON(rate(), #{desc => deprecated_desc(rate), default => Default})}, {rate, ?HOCON(rate_type(), #{desc => deprecated_desc(rate), default => Default})},
{burst, {burst,
?HOCON(burst(), #{ ?HOCON(burst(), #{
desc => deprecated_desc(burst), desc => deprecated_desc(burst),
@ -461,3 +462,12 @@ alias_of_type(_) ->
deprecated_desc(_Field) -> deprecated_desc(_Field) ->
<<"Deprecated since v5.0.25">>. <<"Deprecated since v5.0.25">>.
rate_type() ->
typerefl:alias("string", rate()).
burst_type() ->
typerefl:alias("string", burst()).
burst_rate_type() ->
typerefl:alias("string", burst_rate()).

2
apps/emqx_retainer/src/emqx_retainer_schema.erl
View File

@ -77,7 +77,7 @@ fields("retainer") ->
)}, )},
{delivery_rate, {delivery_rate,
?HOCON( ?HOCON(
emqx_limiter_schema:rate(), emqx_limiter_schema:rate_type(),
#{ #{
required => false, required => false,
desc => ?DESC(delivery_rate), desc => ?DESC(delivery_rate),