diff --git a/apps/emqx_authz/src/emqx_authz.erl b/apps/emqx_authz/src/emqx_authz.erl index d8aa4e859..ab49eb894 100644 --- a/apps/emqx_authz/src/emqx_authz.erl +++ b/apps/emqx_authz/src/emqx_authz.erl @@ -204,13 +204,13 @@ init_source(#{type := file, {ok, Terms} -> [emqx_authz_rule:compile(Term) || Term <- Terms]; {error, eacces} -> - ?LOG(alert, "Insufficient permissions to read the ~ts file", [Path]), + ?SLOG(alert, #{msg => "insufficient_permissions_to_read_file", path => Path}), error(eaccess); {error, enoent} -> - ?LOG(alert, "The ~ts file does not exist", [Path]), + ?SLOG(alert, #{msg => "file_does_not_exist", path => Path}), error(enoent); {error, Reason} -> - ?LOG(alert, "Failed to read ~ts: ~p", [Path, Reason]), + ?SLOG(alert, #{msg => "failed_to_read_file", path => Path, reason => Reason}), error(Reason) end, Source#{annotations => #{rules => Rules}}; @@ -258,15 +258,15 @@ authorize(#{username := Username, } = Client, PubSub, Topic, DefaultResult, Sources) -> case do_authorize(Client, PubSub, Topic, Sources) of {matched, allow} -> - ?LOG(info, "Client succeeded authorization: Username: ~p, IP: ~p, Topic: ~p, Permission: allow", [Username, IpAddress, Topic]), + ?SLOG(info, #{msg => "authorization_permission_allowed", username => Username, ipaddr => IpAddress, topic => Topic}), emqx_metrics:inc(?AUTHZ_METRICS(allow)), {stop, allow}; {matched, deny} -> - ?LOG(info, "Client failed authorization: Username: ~p, IP: ~p, Topic: ~p, Permission: deny", [Username, IpAddress, Topic]), + ?SLOG(info, #{msg => "authorization_permission_denied", username => Username, ipaddr => IpAddress, topic => Topic}), emqx_metrics:inc(?AUTHZ_METRICS(deny)), {stop, deny}; nomatch -> - ?LOG(info, "Client failed authorization: Username: ~p, IP: ~p, Topic: ~p, Reasion: ~p", [Username, IpAddress, Topic, "no-match rule"]), + ?SLOG(info, #{msg => "authorization_failed_nomatch", username => Username, ipaddr => IpAddress, topic => Topic, reason => "no-match rule"}), {stop, DefaultResult} end. diff --git a/apps/emqx_authz/src/emqx_authz_api_sources.erl b/apps/emqx_authz/src/emqx_authz_api_sources.erl index 9c703209a..a349a1314 100644 --- a/apps/emqx_authz/src/emqx_authz_api_sources.erl +++ b/apps/emqx_authz/src/emqx_authz_api_sources.erl @@ -492,7 +492,7 @@ do_write_file(Filename, Bytes) -> case file:write_file(Filename, Bytes) of ok -> {ok, iolist_to_binary(Filename)}; {error, Reason} -> - ?LOG(error, "Write File ~p Error: ~p", [Filename, Reason]), + ?SLOG(error, #{filename => Filename, msg => "write_file_error", reason => Reason}), error(Reason) end. diff --git a/apps/emqx_authz/src/emqx_authz_mongodb.erl b/apps/emqx_authz/src/emqx_authz_mongodb.erl index ca65e6f53..c599ba5ad 100644 --- a/apps/emqx_authz/src/emqx_authz_mongodb.erl +++ b/apps/emqx_authz/src/emqx_authz_mongodb.erl @@ -40,7 +40,7 @@ authorize(Client, PubSub, Topic, }) -> case emqx_resource:query(ResourceID, {find, Collection, replvar(Selector, Client), #{}}) of {error, Reason} -> - ?LOG(error, "[AuthZ] Query mongo error: ~p", [Reason]), + ?SLOG(error, #{msg => "query_mongo_error", reason => Reason, resource_id => ResourceID}), nomatch; [] -> nomatch; Rows -> diff --git a/apps/emqx_authz/src/emqx_authz_mysql.erl b/apps/emqx_authz/src/emqx_authz_mysql.erl index 6ad206d90..6a5845db7 100644 --- a/apps/emqx_authz/src/emqx_authz_mysql.erl +++ b/apps/emqx_authz/src/emqx_authz_mysql.erl @@ -55,7 +55,7 @@ authorize(Client, PubSub, Topic, {ok, Columns, Rows} -> do_authorize(Client, PubSub, Topic, Columns, Rows); {error, Reason} -> - ?LOG(error, "[AuthZ] Query mysql error: ~p~n", [Reason]), + ?SLOG(error, #{msg => "query_mysql_error", reason => Reason, resource_id => ResourceID}), nomatch end. diff --git a/apps/emqx_authz/src/emqx_authz_postgresql.erl b/apps/emqx_authz/src/emqx_authz_postgresql.erl index ead2d985d..2b74eb56e 100644 --- a/apps/emqx_authz/src/emqx_authz_postgresql.erl +++ b/apps/emqx_authz/src/emqx_authz_postgresql.erl @@ -59,7 +59,7 @@ authorize(Client, PubSub, Topic, {ok, Columns, Rows} -> do_authorize(Client, PubSub, Topic, Columns, Rows); {error, Reason} -> - ?LOG(error, "[AuthZ] Query postgresql error: ~p~n", [Reason]), + ?SLOG(error, #{msg => "query_postgresql_error", reason => Reason, resource_id => ResourceID}), nomatch end. diff --git a/apps/emqx_authz/src/emqx_authz_redis.erl b/apps/emqx_authz/src/emqx_authz_redis.erl index 3ac7d7e3f..44c1f6f41 100644 --- a/apps/emqx_authz/src/emqx_authz_redis.erl +++ b/apps/emqx_authz/src/emqx_authz_redis.erl @@ -43,7 +43,7 @@ authorize(Client, PubSub, Topic, {ok, Rows} -> do_authorize(Client, PubSub, Topic, Rows); {error, Reason} -> - ?LOG(error, "[AuthZ] Query redis error: ~p", [Reason]), + ?SLOG(error, #{msg => "query_redis_error", reason => Reason, resource_id => ResourceID}), nomatch end.