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

fix: add user-friendly message when interval is out of range

This commit is contained in:
Paulo Zulato 2023-05-22 23:01:40 -03:00
parent 50ff6c4aa4
commit 122ebcac24
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
apps/emqx_resource/src/schema/emqx_resource_schema.erl
View File

@ -96,12 +96,14 @@ health_check_interval_range(HealthCheckInterval) when
HealthCheckInterval =< ?HEALTH_CHECK_INTERVAL_RANGE_MAX HealthCheckInterval =< ?HEALTH_CHECK_INTERVAL_RANGE_MAX
-> ->
ok; ok;
health_check_interval_range(_HealthCheckInterval) -> health_check_interval_range(HealthCheckInterval) ->
{error, #{ Message = get_out_of_range_msg(
msg => <<"Health Check Interval out of range">>, <<"Health Check Interval">>,
min => ?HEALTH_CHECK_INTERVAL_RANGE_MIN, HealthCheckInterval,
max => ?HEALTH_CHECK_INTERVAL_RANGE_MAX ?HEALTH_CHECK_INTERVAL_RANGE_MIN,
}}. ?HEALTH_CHECK_INTERVAL_RANGE_MAX
),
{error, Message}.
start_after_created(type) -> boolean(); start_after_created(type) -> boolean();
start_after_created(desc) -> ?DESC("start_after_created"); start_after_created(desc) -> ?DESC("start_after_created");
@ -128,12 +130,14 @@ auto_restart_interval_range(AutoRestartInterval) when
AutoRestartInterval =< ?AUTO_RESTART_INTERVAL_RANGE_MAX AutoRestartInterval =< ?AUTO_RESTART_INTERVAL_RANGE_MAX
-> ->
ok; ok;
auto_restart_interval_range(_AutoRestartInterval) -> auto_restart_interval_range(AutoRestartInterval) ->
{error, #{ Message = get_out_of_range_msg(
msg => <<"Auto Restart Interval out of range">>, <<"Auto Restart Interval">>,
min => ?AUTO_RESTART_INTERVAL_RANGE_MIN, AutoRestartInterval,
max => ?AUTO_RESTART_INTERVAL_RANGE_MAX ?AUTO_RESTART_INTERVAL_RANGE_MIN,
}}. ?AUTO_RESTART_INTERVAL_RANGE_MAX
),
{error, Message}.
query_mode(type) -> enum([sync, async]); query_mode(type) -> enum([sync, async]);
query_mode(desc) -> ?DESC("query_mode"); query_mode(desc) -> ?DESC("query_mode");
@ -200,3 +204,15 @@ buffer_seg_bytes(importance) -> ?IMPORTANCE_HIDDEN;
buffer_seg_bytes(_) -> undefined. buffer_seg_bytes(_) -> undefined.
desc("creation_opts") -> ?DESC("creation_opts"). desc("creation_opts") -> ?DESC("creation_opts").
get_value_with_unit(Value) when is_integer(Value) ->
<<(erlang:integer_to_binary(Value))/binary, "ms">>;
get_value_with_unit(Value) ->
Value.
get_out_of_range_msg(Field, Value, Min, Max) ->
ValueStr = get_value_with_unit(Value),
MinStr = get_value_with_unit(Min),
MaxStr = get_value_with_unit(Max),
<<Field/binary, " (", ValueStr/binary, ") is out of range (", MinStr/binary, " to ",
MaxStr/binary, ")">>.