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

Merge pull request #8470 from DDDHuang/tpm_check 

fix(api): topic metrics check exist before create
This commit is contained in:
DDDHuang 2022-07-13 15:26:47 +08:00 committed by GitHub
parent 6b2b0e5e0d 8f18bdff15
commit 88ca8ff503
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_modules/src/emqx_modules.app.src
View File

@ -1,7 +1,7 @@
%% -*- mode: erlang -*- %% -*- mode: erlang -*-
{application, emqx_modules, [ {application, emqx_modules, [
{description, "EMQX Modules"}, {description, "EMQX Modules"},
{vsn, "5.0.1"}, {vsn, "5.0.2"},
{modules, []}, {modules, []},
{applications, [kernel, stdlib, emqx]}, {applications, [kernel, stdlib, emqx]},
{mod, {emqx_modules_app, []}}, {mod, {emqx_modules_app, []}},

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

@ -296,11 +296,16 @@ topic_metrics(put, #{body := #{<<"action">> := <<"reset">>}}) ->
topic_metrics(post, #{body := #{<<"topic">> := <<>>}}) -> topic_metrics(post, #{body := #{<<"topic">> := <<>>}}) ->
{400, 'BAD_REQUEST', <<"Topic can not be empty">>}; {400, 'BAD_REQUEST', <<"Topic can not be empty">>};
topic_metrics(post, #{body := #{<<"topic">> := Topic}}) -> topic_metrics(post, #{body := #{<<"topic">> := Topic}}) ->
case lists:member(Topic, emqx_modules_conf:topic_metrics()) of
false ->
case emqx_modules_conf:add_topic_metrics(Topic) of case emqx_modules_conf:add_topic_metrics(Topic) of
{ok, Topic} -> {ok, Topic} ->
get_cluster_response([Topic]); get_cluster_response([Topic]);
{error, Reason} -> {error, Reason} ->
reason2httpresp(Reason) reason2httpresp(Reason)
end;
true ->
reason2httpresp(already_existed)
end. end.
operate_topic_metrics(get, #{bindings := #{topic := Topic}}) -> operate_topic_metrics(get, #{bindings := #{topic := Topic}}) ->