Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

log type filtering, riak.conf support #1

Open
wants to merge 5 commits into
base: openriak-3.4
Choose a base branch
from
Open

log type filtering, riak.conf support #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a049366
Add log type filter
martinsumner Nov 4, 2024
67be97c
Add function to generate from config
martinsumner Nov 5, 2024
41f2494
Refer to M:F to make exportable
martinsumner Nov 5, 2024
385b941
Fix typo in function name
martinsumner Nov 5, 2024
8ac8dd8
Add specific module for config helper functions
martinsumner Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions rebar.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@
undefined_functions
]}.

{profiles, [
{test, []},
{gha, [{erl_opts, [{d, 'GITHUBEXCLUDE'}]}]}
]}.

{alias, [
{check, [xref, dialyzer]}
]}.
Binary file added rebar3
View file
Open in desktop
Binary file not shown.
21 changes: 20 additions & 1 deletion src/riak_logger.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@
filter_p/2,
filter_ps/2,
filter_r/2,
filter_s/2
filter_s/2,
filter_t/2
]).

-compile([
Expand All @@ -69,6 +70,7 @@

-type f_action() :: log | stop.
-type f_result() :: logger:filter_return().
-type f_type() :: backend|aae|metric.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be atom(), or even term() - the filter, as implemented, doesn't care about the type or value.


%% ===================================================================
%% Filters
Expand Down Expand Up @@ -192,6 +194,23 @@ filter_s(#{meta := #{domain := [otp, sasl | _]}} = Event, Action) ->
filter_s(_Event, _Action) ->
ignore.

-spec filter_t(
Event :: logger:log_event(),
{Action :: f_action(), LogTypes :: list(f_type())})
-> f_result().
%% @doc Filter out logs with specific log_types, e.g. such as the backend log
%% type used in leveled
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a head for the most common case?

filter_t(#{meta := #{log_type := LogType}} = Event, {Action, [LogType]}) ->
    filter_match(Event, Action);

filter_t(#{meta := #{log_type := LogType}} = Event, {Action, LogTypes}) ->
case lists:member(LogType, LogTypes) of
true ->
filter_match(Event, Action);
false ->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change false to _ - generates less code.

ignore
end;
filter_t(_Event, {_Action, _LogTypes}) ->
ignore.


%% ===================================================================
%% Internal
%% ===================================================================
Expand Down
Loading