Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/lager.erl
Original file line number Diff line number Diff line change
Expand Up @@ -440,17 +440,17 @@ get_sink_handler_status(Sink, Handler, Level) ->
end.

%% @doc Set the loglevel for a particular backend.
set_loglevel(Handler, Level) when is_atom(Level) ->
set_loglevel(Handler, Level) when is_atom(Level); is_list(Level) ->
set_loglevel(?DEFAULT_SINK, Handler, undefined, Level).

%% @doc Set the loglevel for a particular backend that has multiple identifiers
%% (eg. the file backend).
set_loglevel(Handler, Ident, Level) when is_atom(Level) ->
set_loglevel(Handler, Ident, Level) when is_atom(Level); is_list(Level) ->
set_loglevel(?DEFAULT_SINK, Handler, Ident, Level).

%% @doc Set the loglevel for a particular sink's backend that potentially has
%% multiple identifiers. (Use `undefined' if it doesn't have any.)
set_loglevel(Sink, Handler, Ident, Level) when is_atom(Level) ->
set_loglevel(Sink, Handler, Ident, Level) when is_atom(Level); is_list(Level) ->
HandlerArg = case Ident of
undefined -> Handler;
_ -> {Handler, Ident}
Expand Down
2 changes: 2 additions & 0 deletions src/lager_console_backend.erl
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,8 @@ set_loglevel_test_() ->
?assertEqual(info, lager:get_loglevel(lager_console_backend)),
lager:set_loglevel(lager_console_backend, '!=info'),
?assertEqual(debug, lager:get_loglevel(lager_console_backend)),
lager:set_loglevel(lager_console_backend, [debug, info]),
?assertEqual(debug, lager:get_loglevel(lager_console_backend)),
ok
end
},
Expand Down
4 changes: 3 additions & 1 deletion src/lager_util.erl
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,11 @@ mask_to_levels(Mask, [Level|Levels], Acc) ->
end,
mask_to_levels(Mask, Levels, NewAcc).

-spec config_to_levels(atom()|string()) -> [lager:log_level()].
-spec config_to_levels(atom()|string()|[atom()]) -> [lager:log_level()].
config_to_levels(Conf) when is_atom(Conf) ->
config_to_levels(atom_to_list(Conf));
config_to_levels([Level | _Rest] = Conf) when is_atom(Level) ->
lists:filter(fun(E) -> lists:member(E, Conf) end, levels());
config_to_levels([$! | Rest]) ->
levels() -- config_to_levels(Rest);
config_to_levels([$=, $< | Rest]) ->
Expand Down