From 9e75ff88af117fdb784f88d876b0ba963fc10a16 Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Wed, 20 Sep 2023 22:15:39 +0800 Subject: [PATCH] chore: apply suggestions from code review Co-authored-by: Thales Macedo Garitezi --- .../src/emqx_bridge_hstreamdb_connector.erl | 2 +- apps/emqx_bridge_http/src/emqx_bridge_http_connector.erl | 2 +- apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl.erl | 2 +- apps/emqx_dashboard/src/emqx_dashboard_api.erl | 4 ++-- apps/emqx_dashboard_sso/src/emqx_dashboard_sso_api.erl | 2 +- apps/emqx_modules/src/emqx_rewrite.erl | 2 +- apps/emqx_oracle/src/emqx_oracle.erl | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/emqx_bridge_hstreamdb/src/emqx_bridge_hstreamdb_connector.erl b/apps/emqx_bridge_hstreamdb/src/emqx_bridge_hstreamdb_connector.erl index 056a8f85a..fdb80b1e1 100644 --- a/apps/emqx_bridge_hstreamdb/src/emqx_bridge_hstreamdb_connector.erl +++ b/apps/emqx_bridge_hstreamdb/src/emqx_bridge_hstreamdb_connector.erl @@ -203,7 +203,7 @@ do_start_client(InstId, Config = #{url := Server, pool_size := PoolSize, ssl := end; {error, {already_started, Pid}} -> ?SLOG(info, #{ - msg => "starting_hstreamdb_connector_client_find_old_client_restart client", + msg => "starting_hstreamdb_connector_client_find_old_client_restart_client", old_client_pid => Pid, old_client_name => ClientName }), diff --git a/apps/emqx_bridge_http/src/emqx_bridge_http_connector.erl b/apps/emqx_bridge_http/src/emqx_bridge_http_connector.erl index 7e6e17cba..0191d5e45 100644 --- a/apps/emqx_bridge_http/src/emqx_bridge_http_connector.erl +++ b/apps/emqx_bridge_http/src/emqx_bridge_http_connector.erl @@ -328,7 +328,7 @@ on_query( {error, {recoverable_error, Reason}}; {error, #{status_code := StatusCode}} -> ?SLOG(error, #{ - msg => "http_connector_do_request_received_error_response.", + msg => "http_connector_do_request_received_error_response", note => "the body will be redacted due to security reasons", request => redact_request(NRequest), connector => InstId, diff --git a/apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl.erl b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl.erl index 65ea7561a..b3ad2ca36 100644 --- a/apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl.erl +++ b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka_impl.erl @@ -78,7 +78,7 @@ tcp_keepalive(KeepAlive) -> Opts; {error, {unsupported_os, OS}} -> ?SLOG(warning, #{ - msg => "Unsupported_operation_set_TCP_keepalive", + msg => "unsupported_operation_set_tcp_keepalive", os => OS }), [] diff --git a/apps/emqx_dashboard/src/emqx_dashboard_api.erl b/apps/emqx_dashboard/src/emqx_dashboard_api.erl index 5ab95ba8d..029e35e3b 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard_api.erl +++ b/apps/emqx_dashboard/src/emqx_dashboard_api.erl @@ -220,7 +220,7 @@ login(post, #{body := Params}) -> Password = maps:get(<<"password">>, Params), case emqx_dashboard_admin:sign_token(Username, Password) of {ok, Token} -> - ?SLOG(info, #{msg => "dashboard_login_successfully", username => Username}), + ?SLOG(info, #{msg => "dashboard_login_successful", username => Username}), Version = iolist_to_binary(proplists:get_value(version, emqx_sys:info())), {200, #{ token => Token, @@ -239,7 +239,7 @@ logout(_, #{ Username = username(Req, Username0), case emqx_dashboard_admin:destroy_token_by_username(Username, Token) of ok -> - ?SLOG(info, #{msg => "dashboard_logout_successfully", username => Username0}), + ?SLOG(info, #{msg => "dashboard_logout_successful", username => Username0}), 204; _R -> ?SLOG(info, #{msg => "dashboard_logout_failed.", username => Username0}), diff --git a/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_api.erl b/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_api.erl index b81fe9a59..c6b0f8673 100644 --- a/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_api.erl +++ b/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_api.erl @@ -121,7 +121,7 @@ login(post, #{bindings := #{backend := Backend}, body := Sign}) -> Provider = emqx_dashboard_sso:provider(Backend), case emqx_dashboard_sso:login(Provider, Sign, State) of {ok, Token} -> - ?SLOG(info, #{msg => "dashboard_sso_login_successfully", request => Sign}), + ?SLOG(info, #{msg => "dashboard_sso_login_successful", request => Sign}), Version = iolist_to_binary(proplists:get_value(version, emqx_sys:info())), {200, #{ token => Token, diff --git a/apps/emqx_modules/src/emqx_rewrite.erl b/apps/emqx_modules/src/emqx_rewrite.erl index 53e1ec8e3..d91371f7e 100644 --- a/apps/emqx_modules/src/emqx_rewrite.erl +++ b/apps/emqx_modules/src/emqx_rewrite.erl @@ -92,7 +92,7 @@ register_hook(Rules) -> ok; _ -> ?SLOG(error, #{ - msg => "rewrite_rule_re_complie_failed", + msg => "rewrite_rule_re_compile_failed", error_rules => ErrRules }), {error, ErrRules} diff --git a/apps/emqx_oracle/src/emqx_oracle.erl b/apps/emqx_oracle/src/emqx_oracle.erl index c7a8b0280..487c1d389 100644 --- a/apps/emqx_oracle/src/emqx_oracle.erl +++ b/apps/emqx_oracle/src/emqx_oracle.erl @@ -358,7 +358,7 @@ init_prepare(State = #{prepare_sql := Prepares, pool_name := PoolName, params_to State#{prepare_sql := Sts}; Error -> LogMeta = #{ - msg => <<"0racle_init_prepare_statement_failed">>, error => Error + msg => <<"oracle_init_prepare_statement_failed">>, error => Error }, ?SLOG(error, LogMeta), %% mark the prepare_sql as failed