rabbit_lager: Use log levels from prelaunch context

Those log levels, coming from the process environment, take precedence
over whatever is configured.

2 files changed, 215 insertions, 147 deletions

diff --git a/src/rabbit_lager.erl b/src/rabbit_lager.erl
index 09a114b129..66e1451c45 100644
--- a/src/rabbit_lager.erl
+++ b/src/rabbit_lager.erl
@@ -243,6 +243,13 @@ configure_lager() ->
             end;
         _ -> ok
     end,
+    case application:get_env(lager, colored) of
+        undefined ->
+            UseColor = rabbit_prelaunch_early_logging:use_colored_logging(),
+            application:set_env(lager, colored, UseColor);
+        _ ->
+            ok
+    end,
     %% Set rabbit.log config variable based on environment.
     prepare_rabbit_log_config(),
     %% Configure syslog library.
@@ -273,7 +280,7 @@ configure_lager() ->
     LogConfig = application:get_env(rabbit, log, []),
     LogLevels = application:get_env(rabbit, log_levels, []),
     Categories = proplists:get_value(categories, LogConfig, []),
-    CategoriesConfig = case {Categories, LogLevels} of
+    CategoriesConfig0 = case {Categories, LogLevels} of
         {[], []} -> [];
         {[], LogLevels} ->
             io:format("Using deprecated config parameter 'log_levels'. "
@@ -283,13 +290,41 @@ configure_lager() ->
                       LogLevels);
         {Categories, []} ->
             Categories;
-        {Categories, LogLevels} ->
+        {Categories, _} ->
             io:format("Using the deprecated config parameter 'rabbit.log_levels' together "
                       "with a new parameter for log categories."
                       " 'rabbit.log_levels' will be ignored. Please remove it from the config. More at "
                       "https://rabbitmq.com/logging.html"),
             Categories
     end,
+    LogLevelsFromContext = case rabbit_prelaunch:get_context() of
+                               #{log_levels := LL} -> LL;
+                               undefined           -> undefined
+                           end,
+    Fun = fun
+              (global, _, CC) ->
+                  CC;
+              (color, _, CC) ->
+                  CC;
+              (CategoryS, LogLevel, CC) ->
+                  Category = list_to_atom(CategoryS),
+                  CCEntry = proplists:get_value(
+                              Category, CC, []),
+                  CCEntry1 = lists:ukeymerge(
+                               1,
+                               [{level, LogLevel}],
+                               lists:ukeysort(1, CCEntry)),
+                  lists:keystore(
+                    Category, 1, CC, {Category, CCEntry1})
+          end,
+    CategoriesConfig = case LogLevelsFromContext of
+                           undefined ->
+                               CategoriesConfig0;
+                           _ ->
+                               maps:fold(Fun,
+                                         CategoriesConfig0,
+                                         LogLevelsFromContext)
+                       end,
     SinkConfigs = lists:map(
         fun({Name, Config}) ->
             {rabbit_log:make_internal_sink_name(Name), Config}
@@ -365,7 +400,10 @@ lager_backend(exchange) -> lager_exchange_backend.
 %% Syslog backend is using an old API for configuration and
 %% does not support proplists.
 generate_handler(syslog_lager_backend=Backend, HandlerConfig) ->
-    DefaultConfigVal = default_config_value(level),
+    %% The default log level is set to `debug` because the actual
+    %% filtering is made at the sink level. We want to accept all
+    %% messages here.
+    DefaultConfigVal = debug,
     Level = proplists:get_value(level, HandlerConfig, DefaultConfigVal),
     ok = configure_handler_backend(Backend),
     [{Backend,
@@ -383,13 +421,25 @@ configure_handler_backend(_Backend) ->
     ok.
 
 default_handler_config(lager_console_backend) ->
-    [{level, default_config_value(level)},
+    %% The default log level is set to `debug` because the actual
+    %% filtering is made at the sink level. We want to accept all
+    %% messages here.
+    DefaultConfigVal = debug,
+    [{level, DefaultConfigVal},
      {formatter_config, default_config_value(formatter_config)}];
 default_handler_config(lager_exchange_backend) ->
-    [{level, default_config_value(level)},
+    %% The default log level is set to `debug` because the actual
+    %% filtering is made at the sink level. We want to accept all
+    %% messages here.
+    DefaultConfigVal = debug,
+    [{level, DefaultConfigVal},
      {formatter_config, default_config_value(formatter_config)}];
 default_handler_config(lager_file_backend) ->
-    [{level, default_config_value(level)},
+    %% The default log level is set to `debug` because the actual
+    %% filtering is made at the sink level. We want to accept all
+    %% messages here.
+    DefaultConfigVal = debug,
+    [{level, DefaultConfigVal},
      {formatter_config, default_config_value(formatter_config)},
      {date, ""},
      {size, 0}].
@@ -398,12 +448,18 @@ default_config_value(level) -> info;
 default_config_value(formatter_config) ->
     [date, " ", time, " ", color, "[", severity, "] ",
        {pid, ""},
-       " ", message, "\n"].
+       " ", message, eol()].
 
 syslog_formatter_config() ->
     [color, "[", severity, "] ",
        {pid, ""},
-       " ", message, "\n"].
+       " ", message, eol()].
+
+eol() ->
+    case application:get_env(lager, colored) of
+        {ok, true}  -> "\e[0m\r\n";
+        _           -> "\r\n"
+    end.
 
 prepare_rabbit_log_config() ->
     %% If RABBIT_LOGS is not set, we should ignore it.
@@ -493,18 +549,30 @@ set_env_upgrade_log_file(FileName) ->
     ok = application:set_env(rabbit, log, NewLogConfig).
 
 generate_lager_sinks(SinkNames, SinkConfigs) ->
+    LogLevels = case rabbit_prelaunch:get_context() of
+                    #{log_levels := LL} -> LL;
+                    undefined           -> undefined
+                end,
+    DefaultLogLevel = case LogLevels of
+                          #{global := LogLevel} ->
+                              LogLevel;
+                          _ ->
+                              default_config_value(level)
+                      end,
     lists:map(fun(SinkName) ->
         SinkConfig = proplists:get_value(SinkName, SinkConfigs, []),
         SinkHandlers = case proplists:get_value(file, SinkConfig, false) of
             %% If no file defined - forward everything to the default backend
             false ->
-                ForwarderLevel = proplists:get_value(level, SinkConfig, inherit),
+                ForwarderLevel = proplists:get_value(level,
+                                                     SinkConfig,
+                                                     DefaultLogLevel),
                 [{lager_forwarder_backend,
                     [lager_util:make_internal_sink_name(lager), ForwarderLevel]}];
             %% If a file defined - add a file backend to handlers and remove all default file backends.
             File ->
                 %% Use `debug` as a default handler to not override a handler level
-                Level = proplists:get_value(level, SinkConfig, debug),
+                Level = proplists:get_value(level, SinkConfig, DefaultLogLevel),
                 DefaultGeneratedHandlers = application:get_env(lager, rabbit_handlers, []),
                 SinkFileHandlers = case proplists:get_value(lager_file_backend, DefaultGeneratedHandlers, undefined) of
                     undefined ->
diff --git a/test/unit_log_config_SUITE.erl b/test/unit_log_config_SUITE.erl
index a13c90a362..ad447f376a 100644
--- a/test/unit_log_config_SUITE.erl
+++ b/test/unit_log_config_SUITE.erl
@@ -93,14 +93,14 @@ sink_file_rewrites_file_backends(_) ->
 
 sink_rewrite_sinks() ->
     [{error_logger_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_channel_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_connection_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_federation_lager_event,
         [{handlers,[
             {lager_file_backend,
@@ -123,32 +123,32 @@ sink_rewrite_sinks() ->
             {lager_exchange_backend, [{level, warning}]}
         ]}]},
      {rabbit_log_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_ldap_lager_event,
-               [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
+               [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
                 {rabbit_handlers,
-                 [{lager_forwarder_backend,[lager_event,inherit]}]}]},
+                 [{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_mirroring_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_prelaunch_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_queue_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_ra_lager_event,
-      [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
+      [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
        {rabbit_handlers,
-        [{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_shovel_lager_event,
-      [{handlers, [{lager_forwarder_backend,[lager_event,inherit]}]},
+      [{handlers, [{lager_forwarder_backend,[lager_event,info]}]},
        {rabbit_handlers,
-        [{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_upgrade_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]}
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]}
      ].
 
 sink_handlers_merged_with_lager_extra_sinks_handlers(_) ->
@@ -180,8 +180,8 @@ sink_handlers_merged_with_lager_extra_sinks_handlers(_) ->
 
     ExpectedSinks = sort_sinks([
         {error_logger_lager_event,
-            [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-             {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+            [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+             {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
          {rabbit_log_channel_lager_event,
             [{handlers,[
                 {lager_console_backend, [{level, error},
@@ -216,35 +216,35 @@ sink_handlers_merged_with_lager_extra_sinks_handlers(_) ->
                         {lager_file_backend, [{file, "connection_lager.log"}, {level, info}]}]},
              {rabbit_handlers,[{lager_forwarder_backend,[lager_event,debug]}]}]},
          {rabbit_log_federation_lager_event,
-            [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-             {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+            [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+             {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
          {rabbit_log_lager_event,
-            [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-             {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+            [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+             {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
          {rabbit_log_ldap_lager_event,
-                   [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
+                   [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
                     {rabbit_handlers,
-                     [{lager_forwarder_backend,[lager_event,inherit]}]}]},
+                     [{lager_forwarder_backend,[lager_event,info]}]}]},
          {rabbit_log_mirroring_lager_event,
-            [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-             {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+            [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+             {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
          {rabbit_log_prelaunch_lager_event,
-            [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-             {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+            [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+             {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
          {rabbit_log_queue_lager_event,
-            [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-             {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+            [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+             {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
          {rabbit_log_ra_lager_event,
-            [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
+            [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
              {rabbit_handlers,
-            [{lager_forwarder_backend,[lager_event,inherit]}]}]},
+            [{lager_forwarder_backend,[lager_event,info]}]}]},
          {rabbit_log_shovel_lager_event,
-            [{handlers, [{lager_forwarder_backend,[lager_event,inherit]}]},
+            [{handlers, [{lager_forwarder_backend,[lager_event,info]}]},
              {rabbit_handlers,
-              [{lager_forwarder_backend,[lager_event,inherit]}]}]},
+              [{lager_forwarder_backend,[lager_event,info]}]}]},
          {rabbit_log_upgrade_lager_event,
-            [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-             {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]}]),
+            [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+             {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]}]),
 
     ?assertEqual(ExpectedSinks, sort_sinks(application:get_env(lager, extra_sinks, undefined))).
 
@@ -295,8 +295,8 @@ config_sinks_level(_) ->
 
 level_sinks() ->
     [{error_logger_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_channel_lager_event,
         [{handlers,[{lager_forwarder_backend,[lager_event,debug]}]},
          {rabbit_handlers,[{lager_forwarder_backend,[lager_event,debug]}]}]},
@@ -304,36 +304,36 @@ level_sinks() ->
         [{handlers,[{lager_forwarder_backend,[lager_event,warning]}]},
          {rabbit_handlers,[{lager_forwarder_backend,[lager_event,warning]}]}]},
      {rabbit_log_federation_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_ldap_lager_event,
-               [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
+               [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
                 {rabbit_handlers,
-                 [{lager_forwarder_backend,[lager_event,inherit]}]}]},
+                 [{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_mirroring_lager_event,
         [{handlers,[{lager_forwarder_backend,[lager_event,error]}]},
          {rabbit_handlers,[{lager_forwarder_backend,[lager_event,error]}]}]},
      {rabbit_log_prelaunch_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_queue_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_ra_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
          {rabbit_handlers,
-        [{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_shovel_lager_event,
-        [{handlers, [{lager_forwarder_backend,[lager_event,inherit]}]},
+        [{handlers, [{lager_forwarder_backend,[lager_event,info]}]},
          {rabbit_handlers,
              [{lager_forwarder_backend,
-                  [lager_event,inherit]}]}]},
+                  [lager_event,info]}]}]},
      {rabbit_log_upgrade_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]}
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]}
      ].
 
 config_sink_file(_) ->
@@ -376,11 +376,11 @@ config_sink_file_override_config_handler_file(_) ->
 
 file_sinks() ->
     [{error_logger_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_channel_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_connection_lager_event,
         [{handlers,[
             {lager_console_backend, [{level, warning},
@@ -406,35 +406,35 @@ file_sinks() ->
                  {size, 0}]}]}
          ]},
      {rabbit_log_federation_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_ldap_lager_event,
-               [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
+               [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
                 {rabbit_handlers,
-                 [{lager_forwarder_backend,[lager_event,inherit]}]}]},
+                 [{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_mirroring_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_prelaunch_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_queue_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_ra_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
          {rabbit_handlers,
-        [{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_shovel_lager_event,
-        [{handlers, [{lager_forwarder_backend,[lager_event,inherit]}]},
+        [{handlers, [{lager_forwarder_backend,[lager_event,info]}]},
          {rabbit_handlers,
-          [{lager_forwarder_backend,[lager_event,inherit]}]}]},
+          [{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_upgrade_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]}
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]}
      ].
 
 config_multiple_handlers(_) ->
@@ -493,14 +493,14 @@ config_exchange_handler(_) ->
     ?assertEqual(ExpectedHandlers, sort_handlers(application:get_env(lager, rabbit_handlers, undefined))).
 
 expected_console_handler() ->
-    expected_console_handler(info).
+    expected_console_handler(debug).
 
 expected_console_handler(Level) ->
     [{lager_console_backend, [{level, Level},
                               {formatter_config, formatter_config()}]}].
 
 expected_rabbit_handler() ->
-    expected_rabbit_handler(info).
+    expected_rabbit_handler(debug).
 
 expected_rabbit_handler(Level) ->
     [{lager_exchange_backend, [{level, Level},
@@ -538,7 +538,7 @@ config_syslog_handler_options(_) ->
     ?assertEqual(ExpectedHandlers, sort_handlers(application:get_env(lager, rabbit_handlers, undefined))).
 
 expected_syslog_handler() ->
-    expected_syslog_handler(info).
+    expected_syslog_handler(debug).
 
 expected_syslog_handler(Level) ->
     [{syslog_lager_backend, [Level,
@@ -603,7 +603,7 @@ config_file_handler_rotation(_) ->
     application:set_env(rabbit, log, [{file, [{date, "$D0"}, {size, 5000}, {count, 10}]}]),
     rabbit_lager:configure_lager(),
 
-    ExpectedHandlers = sort_handlers(default_expected_handlers(DefaultLogFile, info, 5000, "$D0", [{count, 10}])),
+    ExpectedHandlers = sort_handlers(default_expected_handlers(DefaultLogFile, debug, 5000, "$D0", [{count, 10}])),
     ?assertEqual(ExpectedHandlers, sort_handlers(application:get_env(lager, handlers, undefined))),
     ?assertEqual(ExpectedHandlers, sort_handlers(application:get_env(lager, rabbit_handlers, undefined))).
 
@@ -619,14 +619,14 @@ default(_) ->
 
     ExpectedHandlers = default_expected_handlers(LogFile),
     LogRoot = application:get_env(lager, log_root, undefined),
-    ExpectedHandlers = sort_handlers(application:get_env(lager, handlers, undefined)),
+    ?assertEqual(ExpectedHandlers, sort_handlers(application:get_env(lager, handlers, undefined))),
     ?assertEqual(ExpectedHandlers, sort_handlers(application:get_env(lager, rabbit_handlers, undefined))),
 
     ExpectedSinks = default_expected_sinks(LogUpgradeFile),
     ?assertEqual(ExpectedSinks, sort_sinks(application:get_env(lager, extra_sinks, undefined))).
 
 default_expected_handlers(File) ->
-    default_expected_handlers(File, info, 0, "").
+    default_expected_handlers(File, debug, 0, "").
 default_expected_handlers(File, Level) ->
     default_expected_handlers(File, Level, 0, "").
 default_expected_handlers(File, Level, RotSize, RotDate) ->
@@ -641,41 +641,41 @@ default_expected_handlers(File, Level, RotSize, RotDate, Extra) ->
 
 default_expected_sinks(UpgradeFile) ->
     [{error_logger_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_channel_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_connection_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_federation_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_ldap_lager_event,
-               [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
+               [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
                 {rabbit_handlers,
-                 [{lager_forwarder_backend,[lager_event,inherit]}]}]},
+                 [{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_mirroring_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_prelaunch_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_queue_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_ra_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
          {rabbit_handlers,
-        [{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_shovel_lager_event,
-        [{handlers, [{lager_forwarder_backend,[lager_event,inherit]}]},
+        [{handlers, [{lager_forwarder_backend,[lager_event,info]}]},
          {rabbit_handlers,
-          [{lager_forwarder_backend,[lager_event,inherit]}]}]},
+          [{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_upgrade_lager_event,
         [{handlers,
             [{lager_file_backend,
@@ -712,48 +712,48 @@ env_var_tty(_) ->
 tty_expected_handlers() ->
     [{lager_console_backend,
         [{formatter_config, formatter_config()},
-         {level, info}]}].
+         {level, debug}]}].
 
 tty_expected_sinks() ->
     [{error_logger_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_channel_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_connection_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_federation_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_lager_event,
-        [{handlers, [{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers, [{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers, [{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers, [{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_ldap_lager_event,
-               [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
+               [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
                 {rabbit_handlers,
-                 [{lager_forwarder_backend,[lager_event,inherit]}]}]},
+                 [{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_mirroring_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_prelaunch_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_queue_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_ra_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
          {rabbit_handlers,
-        [{lager_forwarder_backend,[lager_event,inherit]}]}]},
+        [{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_shovel_lager_event,
-        [{handlers, [{lager_forwarder_backend,[lager_event,inherit]}]},
+        [{handlers, [{lager_forwarder_backend,[lager_event,info]}]},
          {rabbit_handlers,
-          [{lager_forwarder_backend,[lager_event,inherit]}]}]},
+          [{lager_forwarder_backend,[lager_event,info]}]}]},
      {rabbit_log_upgrade_lager_event,
-        [{handlers,[{lager_forwarder_backend,[lager_event,inherit]}]},
-         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,inherit]}]}]}].
+        [{handlers,[{lager_forwarder_backend,[lager_event,info]}]},
+         {rabbit_handlers,[{lager_forwarder_backend,[lager_event,info]}]}]}].
 
 sort_sinks(Sinks) ->
     lists:ukeysort(1,
@@ -781,7 +781,7 @@ sort_handlers(Handlers) ->
             Handlers)).
 
 formatter_config() ->
-    [date," ",time," ",color,"[",severity, "] ", {pid,[]}, " ",message,"\n"].
+    [date," ",time," ",color,"[",severity, "] ", {pid,[]}, " ",message,"\r\n"].
 
 syslog_formatter_config() ->
-    [color,"[",severity, "] ", {pid,[]}, " ",message,"\n"].
+    [color,"[",severity, "] ", {pid,[]}, " ",message,"\r\n"].