Skip to content

Commit 54fc8f1

Browse files
author
Daniil Fedotov
committed
Update default category loglevel to inherit
Change default level for categories to make them log `debug` messages if there is a handler to output them.
1 parent 9fd0378 commit 54fc8f1

File tree

2 files changed

+87
-83
lines changed

2 files changed

+87
-83
lines changed

‎src/rabbit_lager.erl‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,19 +392,23 @@ set_env_upgrade_log_file(FileName) ->
392392
generate_lager_sinks(SinkNames, SinkConfigs) ->
393393
lists:map(fun(SinkName) ->
394394
SinkConfig = proplists:get_value(SinkName, SinkConfigs, []),
395-
Level = proplists:get_value(level, SinkConfig, default_config_value(level)),
396395
SinkHandlers = case proplists:get_value(file, SinkConfig, false) of
397396
%% If no file defined - forward everything to the default backend
398397
false ->
398+
ForwarderLevel = proplists:get_value(level, SinkConfig, inherit),
399399
[{lager_forwarder_backend,
400-
[lager_util:make_internal_sink_name(lager), Level]}];
400+
[lager_util:make_internal_sink_name(lager), ForwarderLevel]}];
401401
%% If a file defined - add a file backend to handlers and remove all default file backends.
402402
File ->
403+
%% Use `debug` as a default handler to not override a handler level
404+
Level = proplists:get_value(level, SinkConfig, debug),
403405
DefaultGeneratedHandlers = application:get_env(lager, rabbit_handlers, []),
404406
SinkFileHandlers = case proplists:get_value(lager_file_backend, DefaultGeneratedHandlers, undefined) of
405407
undefined ->
406408
%% Create a new file handler.
407-
generate_lager_handlers([{file, [{file, File}, {level, Level}]}]);
409+
%% `info` is a default level here.
410+
FileLevel = proplists:get_value(level, SinkConfig, default_config_value(level)),
411+
generate_lager_handlers([{file, [{file, File}, {level, FileLevel}]}]);
408412
FileHandler ->
409413
%% Replace a filename in the handler
410414
FileHandlerChanges = case handler_level_more_verbose(FileHandler, Level) of

‎test/unit_log_config_SUITE.erl‎

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@ sink_file_rewrites_file_backends(_) ->
9292

9393
sink_rewrite_sinks() ->
9494
[{error_logger_lager_event,
95-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
96-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
95+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
96+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
9797
{rabbit_log_channel_lager_event,
98-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
99-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
98+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
99+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
100100
{rabbit_log_connection_lager_event,
101-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
102-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
101+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
102+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
103103
{rabbit_log_federation_lager_event,
104104
[{handlers,[
105105
{lager_file_backend,
@@ -120,17 +120,17 @@ sink_rewrite_sinks() ->
120120
{lager_console_backend, [{level, warning}]}
121121
]}]},
122122
{rabbit_log_lager_event,
123-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
124-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
123+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
124+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
125125
{rabbit_log_mirroring_lager_event,
126-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
127-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
126+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
127+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
128128
{rabbit_log_queue_lager_event,
129-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
130-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
129+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
130+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
131131
{rabbit_log_upgrade_lager_event,
132-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
133-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]}
132+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
133+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]}
134134
].
135135

136136

@@ -161,8 +161,8 @@ sink_handlers_merged_with_lager_extra_sinks_handlers(_) ->
161161

162162
ExpectedSinks = sort_sinks([
163163
{error_logger_lager_event,
164-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
165-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
164+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
165+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
166166
{rabbit_log_channel_lager_event,
167167
[{handlers,[
168168
{lager_console_backend, [{level, error},
@@ -192,20 +192,20 @@ sink_handlers_merged_with_lager_extra_sinks_handlers(_) ->
192192
{lager_file_backend, [{file, "connection_lager.log"}, {level, info}]}]},
193193
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,debug]}]}]},
194194
{rabbit_log_federation_lager_event,
195-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
196-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
195+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
196+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
197197
{rabbit_log_lager_event,
198-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
199-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
198+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
199+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
200200
{rabbit_log_mirroring_lager_event,
201-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
202-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
201+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
202+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
203203
{rabbit_log_queue_lager_event,
204-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
205-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
204+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
205+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
206206
{rabbit_log_upgrade_lager_event,
207-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
208-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]}]),
207+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
208+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]}]),
209209

210210
?assertEqual(ExpectedSinks, sort_sinks(application:get_env(lager, extra_sinks, undefined))).
211211

@@ -254,29 +254,29 @@ config_sinks_level(_) ->
254254

255255
level_sinks() ->
256256
[{error_logger_lager_event,
257-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
258-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
257+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
258+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
259259
{rabbit_log_channel_lager_event,
260260
[{handlers,[{lager_forwarder_backend,[lager_event,debug]}]},
261261
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,debug]}]}]},
262262
{rabbit_log_connection_lager_event,
263263
[{handlers,[{lager_forwarder_backend,[lager_event,warning]}]},
264264
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,warning]}]}]},
265265
{rabbit_log_federation_lager_event,
266-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
267-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
266+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
267+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
268268
{rabbit_log_lager_event,
269-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
270-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
269+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
270+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
271271
{rabbit_log_mirroring_lager_event,
272272
[{handlers,[{lager_forwarder_backend,[lager_event,error]}]},
273273
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,error]}]}]},
274274
{rabbit_log_queue_lager_event,
275-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
276-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
275+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
276+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
277277
{rabbit_log_upgrade_lager_event,
278-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
279-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]}
278+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
279+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]}
280280
].
281281

282282
config_sink_file(_) ->
@@ -318,11 +318,11 @@ config_sink_file_override_config_handler_file(_) ->
318318

319319
file_sinks() ->
320320
[{error_logger_lager_event,
321-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
322-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
321+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
322+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
323323
{rabbit_log_channel_lager_event,
324-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
325-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
324+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
325+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
326326
{rabbit_log_connection_lager_event,
327327
[{handlers,[
328328
{lager_console_backend, [{level, warning},
@@ -344,20 +344,20 @@ file_sinks() ->
344344
{size, 0}]}]}
345345
]},
346346
{rabbit_log_federation_lager_event,
347-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
348-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
347+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
348+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
349349
{rabbit_log_lager_event,
350-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
351-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
350+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
351+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
352352
{rabbit_log_mirroring_lager_event,
353-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
354-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
353+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
354+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
355355
{rabbit_log_queue_lager_event,
356-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
357-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
356+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
357+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
358358
{rabbit_log_upgrade_lager_event,
359-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
360-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]}
359+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
360+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]}
361361
].
362362

363363

@@ -545,26 +545,26 @@ default_expected_handlers(File, Level, RotSize, RotDate, Extra) ->
545545

546546
default_expected_sinks(UpgradeFile) ->
547547
[{error_logger_lager_event,
548-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
549-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
548+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
549+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
550550
{rabbit_log_channel_lager_event,
551-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
552-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
551+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
552+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
553553
{rabbit_log_connection_lager_event,
554-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
555-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
554+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
555+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
556556
{rabbit_log_federation_lager_event,
557-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
558-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
557+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
558+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
559559
{rabbit_log_lager_event,
560-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
561-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
560+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
561+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
562562
{rabbit_log_mirroring_lager_event,
563-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
564-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
563+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
564+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
565565
{rabbit_log_queue_lager_event,
566-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
567-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
566+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
567+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
568568
{rabbit_log_upgrade_lager_event,
569569
[{handlers,
570570
[{lager_file_backend,
@@ -605,29 +605,29 @@ tty_expected_handlers() ->
605605

606606
tty_expected_sinks() ->
607607
[{error_logger_lager_event,
608-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
609-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
608+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
609+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
610610
{rabbit_log_channel_lager_event,
611-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
612-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
611+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
612+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
613613
{rabbit_log_connection_lager_event,
614-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
615-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
614+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
615+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
616616
{rabbit_log_federation_lager_event,
617-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
618-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
617+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
618+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
619619
{rabbit_log_lager_event,
620-
[{handlers, [{lager_forwarder_backend,[lager_event,info]}]},
621-
{rabbit_handlers, [{lager_forwarder_backend,[lager_event,info]}]}]},
620+
[{handlers, [{lager_forwarder_backend,[lager_event,inherit]}]},
621+
{rabbit_handlers, [{lager_forwarder_backend,[lager_event,inherit]}]}]},
622622
{rabbit_log_mirroring_lager_event,
623-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
624-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
623+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
624+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
625625
{rabbit_log_queue_lager_event,
626-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
627-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
626+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
627+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
628628
{rabbit_log_upgrade_lager_event,
629-
[{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
630-
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]}].
629+
[{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
630+
{rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]}].
631631

632632
sort_sinks(Sinks) ->
633633
lists:ukeysort(1,

0 commit comments

Comments
 (0)