diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2017-08-21 16:10:13 +0100 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2017-08-21 16:11:50 +0100 |
| commit | 57825b776711e64c5815b87346dcf3679523bd90 (patch) | |
| tree | a5683214ff4c4b0d8b22d11e611a465af53b563f /src | |
| parent | 0c6255e368ffb6000d403568c0ed0f6d125d25b0 (diff) | |
| download | rabbitmq-server-git-57825b776711e64c5815b87346dcf3679523bd90.tar.gz | |
Log configuration tests
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_lager.erl | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/rabbit_lager.erl b/src/rabbit_lager.erl index 36f2b159bc..b9dee6c623 100644 --- a/src/rabbit_lager.erl +++ b/src/rabbit_lager.erl @@ -21,6 +21,9 @@ %% API -export([start_logger/0, log_locations/0, fold_sinks/2]). +%% For test purposes +-export([configure_lager/0]). + start_logger() -> application:stop(lager), ensure_lager_configured(), @@ -300,11 +303,12 @@ default_config_value(formatter_config) -> " ", message, "\n"]. prepare_rabbit_log_config() -> - %% If RABBIT_LOGS is not set, we should use console logger - DefaultFile = application:get_env(rabbit, lager_default_file, tty), + %% If RABBIT_LOGS is not set, we should ignore it. + DefaultFile = application:get_env(rabbit, lager_default_file, undefined), %% If RABBIT_UPGRADE_LOGS is not set, we should ignore it. UpgradeFile = application:get_env(rabbit, lager_upgrade_file, undefined), case DefaultFile of + undefined -> ok; false -> set_env_default_log_disabled(); tty -> @@ -403,9 +407,13 @@ generate_lager_sinks(SinkNames, SinkConfigs) -> generate_lager_handlers([{file, [{file, File}, {level, Level}]}]); FileHandler -> %% Replace a filename in the handler + FileHandlerChanges = case handler_level_more_verbose(FileHandler, Level) of + true -> [{file, File}, {level, Level}]; + false -> [{file, File}] + end, + [{lager_file_backend, - lists:ukeymerge(1, - [{file, File}, {level, Level}], + lists:ukeymerge(1, FileHandlerChanges, lists:ukeysort(1, FileHandler))}] end, %% Remove all file handlers. |