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

Merge pull request #7727 from HJianBo/text-improve 

chore: improve error message
This commit is contained in:
JianBo He 2022-04-22 21:55:31 +08:00 committed by GitHub
parent 14d80c7c46 239f159306
commit 92e010b652
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/emqx_modules/src/emqx_topic_metrics.erl
View File

@ -309,6 +309,10 @@ do_register(Topic, Speeds) ->
{error, already_existed};
false ->
case {number_of_registered_topics() < ?MAX_TOPICS, emqx_topic:wildcard(Topic)} of
{_, true} ->
{error, bad_topic};
{false, _} ->
{error, quota_exceeded};
{true, false} ->
CreateTime = emqx_rule_funcs:now_rfc3339(),
CRef = counters:new(counters_size(), [write_concurrency]),
@ -325,13 +329,7 @@ do_register(Topic, Speeds) ->
Speeds,
?TOPIC_METRICS
),
{ok, NSpeeds};
{true, true} ->
{error, bad_topic};
{false, false} ->
{error, quota_exceeded};
{false, true} ->
{error, {quota_exceeded, bad_topic}}
{ok, NSpeeds}
end
end.

10
apps/emqx_modules/src/emqx_topic_metrics_api.erl
View File

@ -572,16 +572,8 @@ reason2httpresp(quota_exceeded) ->
),
{409, #{code => ?EXCEED_LIMIT, message => Msg}};
reason2httpresp(bad_topic) ->
Msg = <<"Bad Topic, topic cannot have wildcard">>,
Msg = <<"Wildcard topic is not supported">>,
{400, #{code => ?BAD_TOPIC, message => Msg}};
reason2httpresp({quota_exceeded, bad_topic}) ->
Msg = list_to_binary(
io_lib:format(
"Max topic metrics count is ~p, and topic cannot have wildcard",
[emqx_topic_metrics:max_limit()]
)
),
{400, #{code => ?BAD_REQUEST, message => Msg}};
reason2httpresp(already_existed) ->
Msg = <<"Topic already registered">>,
{400, #{code => ?BAD_TOPIC, message => Msg}};