diff --git a/apps/emqx_modules/src/emqx_modules_conf.erl b/apps/emqx_modules/src/emqx_modules_conf.erl index a757e0878..386f269f0 100644 --- a/apps/emqx_modules/src/emqx_modules_conf.erl +++ b/apps/emqx_modules/src/emqx_modules_conf.erl @@ -81,8 +81,8 @@ cfg_update(topic_metrics, Action, Params) -> #{override_to => cluster})). res({ok, Result}) -> {ok, Result}; -res({error, {pre_config_update,?MODULE,Reason}}) -> {error, Reason}; -res({error, {post_config_update,?MODULE,Reason}}) -> {error, Reason}; +res({error, {pre_config_update, ?MODULE, Reason}}) -> {error, Reason}; +res({error, {post_config_update, ?MODULE, Reason}}) -> {error, Reason}; res({error, Reason}) -> {error, Reason}. %%-------------------------------------------------------------------- @@ -97,7 +97,7 @@ pre_config_update(_, {add_topic_metrics, Topic0}, RawConf) -> Topic = #{<<"topic">> => Topic0}, case lists:member(Topic, RawConf) of true -> - {error, already_exist}; + {error, already_existed}; _ -> {ok, RawConf ++ [Topic]} end; diff --git a/apps/emqx_modules/src/emqx_topic_metrics_api.erl b/apps/emqx_modules/src/emqx_topic_metrics_api.erl index a45a8fd33..1ba76579b 100644 --- a/apps/emqx_modules/src/emqx_topic_metrics_api.erl +++ b/apps/emqx_modules/src/emqx_topic_metrics_api.erl @@ -13,7 +13,7 @@ %% See the License for the specific language governing permissions and %% limitations under the License. %%-------------------------------------------------------------------- -%% TODO: refactor uri path + -module(emqx_topic_metrics_api). -behaviour(minirest_api). @@ -151,10 +151,8 @@ topic_metrics(put, #{body := #{<<"topic">> := Topic, <<"action">> := <<"reset">> {error, Reason} -> reason2httpresp(Reason) end; topic_metrics(put, #{body := #{<<"action">> := <<"reset">>}}) -> - case reset() of - ok -> {200}; - {error, Reason} -> reason2httpresp(Reason) - end; + reset(), + {200}; topic_metrics(post, #{body := #{<<"topic">> := <<>>}}) -> {400, 'BAD_REQUEST', <<"Topic can not be empty">>}; @@ -177,8 +175,7 @@ operate_topic_metrics(get, #{bindings := #{topic := Topic0}}) -> operate_topic_metrics(delete, #{bindings := #{topic := Topic0}}) -> case emqx_modules_conf:remove_topic_metrics(emqx_http_lib:uri_decode(Topic0)) of ok -> {200}; - {error, Reason} -> - reason2httpresp(Reason) + {error, Reason} -> reason2httpresp(Reason) end. %%-------------------------------------------------------------------- @@ -285,9 +282,9 @@ reason2httpresp({quota_exceeded, bad_topic}) -> reason2httpresp(already_existed) -> Msg = <<"Topic already registered">>, {400, #{code => ?BAD_TOPIC, message => Msg}}; -reason2httpresp(not_found) -> - Msg = <<"Topic not found">>, - {404, #{code => ?ERROR_TOPIC, message => Msg}}; reason2httpresp(topic_not_found) -> + Msg = <<"Topic not found">>, + {404, #{code => ?ERROR_TOPIC, message => Msg}}; +reason2httpresp(not_found) -> Msg = <<"Topic not found">>, {404, #{code => ?ERROR_TOPIC, message => Msg}}.