Merge pull request #2142 from rabbitmq/rabbitmq-server-script-replacement

Move rabbitmq-server(8) scripts to Erlang

5 files changed, 191 insertions, 155 deletions

diff --git a/test/clustering_management_SUITE.erl b/test/clustering_management_SUITE.erl
index 90bb75636e..7335767398 100644
--- a/test/clustering_management_SUITE.erl
+++ b/test/clustering_management_SUITE.erl
@@ -224,8 +224,7 @@ join_cluster_bad_operations(Config) ->
     ok = stop_app(Hare),
     assert_failure(fun () -> start_app(Hare) end),
     ok = start_app(Rabbit),
-    %% The Erlang VM has stopped after previous rabbit app failure
-    ok = rabbit_ct_broker_helpers:start_node(Config, Hare),
+    ok = start_app(Hare),
     ok.
 
 %% This tests that the nodes in the cluster are notified immediately of a node
diff --git a/test/feature_flags_SUITE.erl b/test/feature_flags_SUITE.erl
index 16f11733d5..8f672314f0 100644
--- a/test/feature_flags_SUITE.erl
+++ b/test/feature_flags_SUITE.erl
@@ -136,14 +136,18 @@ init_per_group(clustering, Config) ->
                 [{rmq_nodes_count, 2},
                  {rmq_nodes_clustered, false},
                  {start_rmq_with_plugins_disabled, true}]),
-    build_my_plugin(Config1);
+    rabbit_ct_helpers:run_setup_steps(Config1, [
+        fun build_my_plugin/1
+      ]);
 init_per_group(activating_plugin, Config) ->
     Config1 = rabbit_ct_helpers:set_config(
                 Config,
                 [{rmq_nodes_count, 2},
                  {rmq_nodes_clustered, true},
                  {start_rmq_with_plugins_disabled, true}]),
-    build_my_plugin(Config1);
+    rabbit_ct_helpers:run_setup_steps(Config1, [
+        fun build_my_plugin/1
+      ]);
 init_per_group(_, Config) ->
     Config.
 
@@ -910,13 +914,31 @@ build_my_plugin(Config) ->
                 {ok, _} ->
                     {_, OtherPlugins1} = list_my_plugin_plugins(PluginSrcDir),
                     remove_other_plugins(PluginSrcDir, OtherPlugins1),
-                    Config1;
+                    update_cli_path(Config1, PluginSrcDir);
                 {error, _} ->
                     {skip, "Failed to compile the `my_plugin` test plugin"}
             end;
         _ ->
             remove_other_plugins(PluginSrcDir, OtherPlugins),
-            Config1
+            update_cli_path(Config1, PluginSrcDir)
+    end.
+
+update_cli_path(Config, PluginSrcDir) ->
+    SbinDir = filename:join(PluginSrcDir, "sbin"),
+    Rabbitmqctl = filename:join(SbinDir, "rabbitmqctl"),
+    RabbitmqPlugins = filename:join(SbinDir, "rabbitmq-plugins"),
+    RabbitmqQueues = filename:join(SbinDir, "rabbitmq-queues"),
+    case filelib:is_regular(Rabbitmqctl) of
+        true ->
+            ct:pal(?LOW_IMPORTANCE,
+                   "Switching to CLI in e.g. ~s", [Rabbitmqctl]),
+            rabbit_ct_helpers:set_config(
+              Config,
+              [{rabbitmqctl_cmd, Rabbitmqctl},
+               {rabbitmq_plugins_cmd, RabbitmqPlugins},
+               {rabbitmq_queues_cmd, RabbitmqQueues}]);
+        false ->
+            Config
     end.
 
 list_my_plugin_plugins(PluginSrcDir) ->
diff --git a/test/unit_SUITE.erl b/test/unit_SUITE.erl
index 2bea590342..e8abd2ae90 100644
--- a/test/unit_SUITE.erl
+++ b/test/unit_SUITE.erl
@@ -44,8 +44,6 @@ groups() ->
             ]},
           content_framing,
           content_transcoding,
-          decrypt_config,
-          listing_plugins_from_multiple_directories,
           rabbitmqctl_encode,
           pmerge,
           plmerge,
@@ -72,7 +70,9 @@ groups() ->
           decrypt_start_app,
           decrypt_start_app_file,
           decrypt_start_app_undefined,
-          decrypt_start_app_wrong_passphrase
+          decrypt_start_app_wrong_passphrase,
+          decrypt_config,
+          listing_plugins_from_multiple_directories
         ]}
     ].
 
@@ -81,20 +81,13 @@ end_per_group(_, Config) -> Config.
 
 init_per_testcase(TC, Config) when TC =:= decrypt_start_app;
                                    TC =:= decrypt_start_app_file;
-                                   TC =:= decrypt_start_app_undefined ->
-    application:load(rabbit),
-    application:set_env(rabbit, feature_flags_file, ""),
+                                   TC =:= decrypt_start_app_undefined;
+                                   TC =:= decrypt_start_app_wrong_passphrase ->
+    application:set_env(rabbit, feature_flags_file, "", [{persistent, true}]),
     Config;
 init_per_testcase(_Testcase, Config) ->
     Config.
 
-end_per_testcase(TC, _Config) when TC =:= decrypt_start_app;
-                                   TC =:= decrypt_start_app_file;
-                                   TC =:= decrypt_start_app_undefined ->
-    application:unload(rabbit),
-    application:unload(rabbit_shovel_test);
-end_per_testcase(decrypt_config, _Config) ->
-    application:unload(rabbit);
 end_per_testcase(_TC, _Config) ->
     ok.
 
@@ -177,7 +170,7 @@ decrypt_config(_Config) ->
     ok.
 
 do_decrypt_config(Algo = {C, H, I, P}) ->
-    application:load(rabbit),
+    ok = application:load(rabbit),
     RabbitConfig = application:get_all_env(rabbit),
     %% Encrypt a few values in configuration.
     %% Common cases.
@@ -205,10 +198,10 @@ do_decrypt_config(Algo = {C, H, I, P}) ->
     TCPOpts2 = lists:keyreplace(linger, 1, TCPOpts1, {linger, {encrypted, EncLinger}}),
     application:set_env(rabbit, tcp_listen_options, TCPOpts2),
     %% Decrypt configuration.
-    rabbit:decrypt_config([rabbit], Algo),
+    rabbit_prelaunch_conf:decrypt_config([rabbit], Algo),
     %% Check that configuration was decrypted properly.
     RabbitConfig = application:get_all_env(rabbit),
-    application:unload(rabbit),
+    ok = application:unload(rabbit),
     ok.
 
 encrypt_value(Key, {C, H, I, P}) ->
@@ -229,7 +222,7 @@ do_decrypt_start_app(Config, Passphrase) ->
         {hash, sha512},
         {iterations, 1000},
         {passphrase, Passphrase}
-    ]),
+    ], [{persistent, true}]),
     %% Add the path to our test application.
     code:add_path(?config(data_dir, Config) ++ "/lib/rabbit_shovel_test/ebin"),
     %% Attempt to start our test application.
@@ -256,7 +249,7 @@ decrypt_start_app_undefined(Config) ->
         {hash, sha512},
         {iterations, 1000}
         %% No passphrase option!
-    ]),
+    ], [{persistent, true}]),
     %% Add the path to our test application.
     code:add_path(?config(data_dir, Config) ++ "/lib/rabbit_shovel_test/ebin"),
     %% Attempt to start our test application.
@@ -265,7 +258,7 @@ decrypt_start_app_undefined(Config) ->
     try
         rabbit:start_apps([rabbit_shovel_test], #{rabbit => temporary})
     catch
-        exit:{bad_configuration, config_entry_decoder} -> ok;
+        throw:{bad_config_entry_decoder, missing_passphrase} -> ok;
         _:Exception -> exit({unexpected_exception, Exception})
     end.
 
@@ -276,7 +269,7 @@ decrypt_start_app_wrong_passphrase(Config) ->
         {hash, sha512},
         {iterations, 1000},
         {passphrase, "wrong passphrase"}
-    ]),
+    ], [{persistent, true}]),
     %% Add the path to our test application.
     code:add_path(?config(data_dir, Config) ++ "/lib/rabbit_shovel_test/ebin"),
     %% Attempt to start our test application.
@@ -285,7 +278,7 @@ decrypt_start_app_wrong_passphrase(Config) ->
     try
         rabbit:start_apps([rabbit_shovel_test], #{rabbit => temporary})
     catch
-        exit:{decryption_error,_,_} -> ok;
+        throw:{config_decryption_error, _, _} -> ok;
         _:Exception -> exit({unexpected_exception, Exception})
     end.
 
@@ -961,6 +954,10 @@ listing_plugins_from_multiple_directories(Config) ->
               end,
     Path = FirstDir ++ PathSep ++ SecondDir,
     Got = lists:sort([{Name, Vsn} || #plugin{name = Name, version = Vsn} <- rabbit_plugins:list(Path)]),
+    %% `rabbit` was loaded automatically by `rabbit_plugins:list/1`.
+    %% We want to unload it now so it does not interfere with other
+    %% testcases.
+    application:unload(rabbit),
     Expected = [{plugin_both, "2"}, {plugin_first_dir, "3"}, {plugin_second_dir, "4"}],
     case Got of
         Expected ->
diff --git a/test/unit_inbroker_non_parallel_SUITE.erl b/test/unit_inbroker_non_parallel_SUITE.erl
index 120a7fdbd9..2b4a216977 100644
--- a/test/unit_inbroker_non_parallel_SUITE.erl
+++ b/test/unit_inbroker_non_parallel_SUITE.erl
@@ -503,7 +503,7 @@ log_file_fails_to_initialise_during_startup1(_Config, NonWritableDir) ->
         ok -> exit({got_success_but_expected_failure,
                     log_rotation_no_write_permission_dir_test})
     catch
-        _:could_not_initialise_logger -> ok
+        throw:{error, {rabbit, {{cannot_log_to_file, _, _}, _}}} -> ok
     end,
 
     %% start application with logging to a subdirectory which
@@ -530,7 +530,7 @@ log_file_fails_to_initialise_during_startup1(_Config, NonWritableDir) ->
         ok -> exit({got_success_but_expected_failure,
                     log_rotation_parent_dirs_test})
     catch
-        _:could_not_initialise_logger -> ok
+        throw:{error, {rabbit, {{cannot_log_to_file, _, _}, _}}} -> ok
     end,
 
     %% clean up
diff --git a/test/unit_log_config_SUITE.erl b/test/unit_log_config_SUITE.erl
index 93c050edda..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,29 +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,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(_) ->
@@ -177,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},
@@ -213,32 +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,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))).
 
@@ -285,12 +291,12 @@ config_sinks_level(_) ->
     rabbit_lager:configure_lager(),
 
     ExpectedSinks = sort_sinks(level_sinks()),
-    ExpectedSinks = sort_sinks(application:get_env(lager, extra_sinks, undefined)).
+    ?assertEqual(ExpectedSinks, sort_sinks(application:get_env(lager, extra_sinks, undefined))).
 
 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]}]}]},
@@ -298,33 +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,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(_) ->
@@ -367,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},
@@ -397,32 +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,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(_) ->
@@ -481,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},
@@ -526,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,
@@ -591,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))).
 
@@ -607,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) ->
@@ -629,38 +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,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,
@@ -697,45 +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,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,
@@ -763,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"].