[skip ci] Remove rabbit_log_connection and use LOG_ macros

Author: mkuratczyk

deps/rabbit/src/rabbit_connection_tracking.erl

@@ -78,11 +78,11 @@ handle_cast({connection_created, Details}) ->
                 error:{no_exists, _} ->
                     Msg = "Could not register connection ~tp for tracking, "
                           "its table is not ready yet or the connection terminated prematurely",
-                    rabbit_log_connection:warning(Msg, [ConnId]),
+                    ?LOG_WARNING(Msg, [ConnId]),
                     ok;
                 error:Err ->
                     Msg = "Could not register connection ~tp for tracking: ~tp",
-                    rabbit_log_connection:warning(Msg, [ConnId, Err]),
+                    ?LOG_WARNING(Msg, [ConnId, Err]),
                     ok
             end;
         _OtherNode ->
@@ -107,7 +107,7 @@ handle_cast({vhost_deleted, Details}) ->
     %% Schedule vhost entry deletion, allowing time for connections to close
     _ = timer:apply_after(?TRACKING_EXECUTION_TIMEOUT, ?MODULE,
             delete_tracked_connection_vhost_entry, [VHost]),
-    rabbit_log_connection:info("Closing all connections in vhost '~ts' because it's being deleted", [VHost]),
+    ?LOG_INFO("Closing all connections in vhost '~ts' because it's being deleted", [VHost]),
     shutdown_tracked_items(
         list(VHost),
         rabbit_misc:format("vhost '~ts' is deleted", [VHost]));
@@ -117,7 +117,7 @@ handle_cast({vhost_deleted, Details}) ->
 handle_cast({vhost_down, Details}) ->
     VHost = pget(name, Details),
     Node = pget(node, Details),
-    rabbit_log_connection:info("Closing all connections in vhost '~ts' on node '~ts'"
+    ?LOG_INFO("Closing all connections in vhost '~ts' on node '~ts'"
                                " because the vhost is stopping",
                                [VHost, Node]),
     shutdown_tracked_items(
@@ -128,7 +128,7 @@ handle_cast({user_deleted, Details}) ->
     %% Schedule user entry deletion, allowing time for connections to close
     _ = timer:apply_after(?TRACKING_EXECUTION_TIMEOUT, ?MODULE,
             delete_tracked_connection_user_entry, [Username]),
-    rabbit_log_connection:info("Closing all connections for user '~ts' because the user is being deleted", [Username]),
+    ?LOG_INFO("Closing all connections for user '~ts' because the user is being deleted", [Username]),
     shutdown_tracked_items(
         list_of_user(Username),
         rabbit_misc:format("user '~ts' is deleted", [Username])).

deps/rabbit/src/rabbit_connection_tracking_handler.erl

@@ -22,6 +22,7 @@
 -export([close_connections/3]).
 
 -include_lib("rabbit_common/include/rabbit.hrl").
+-include_lib("rabbit_common/include/logging.hrl").
 
 -rabbit_boot_step({?MODULE,
                    [{description, "connection tracking event handler"},
@@ -37,6 +38,7 @@
 %%
 
 init([]) ->
+    logger:set_process_metadata(#{domain => ?RMQLOG_DOMAIN_CONN}),
     {ok, []}.
 
 handle_event(#event{type = connection_created, props = Details}, State) ->

deps/rabbit/src/rabbit_direct.erl

@@ -20,6 +20,7 @@
 
 -include_lib("rabbit_common/include/rabbit.hrl").
 -include_lib("rabbit_common/include/rabbit_misc.hrl").
+-include_lib("kernel/include/logger.hrl").
 
 %%----------------------------------------------------------------------------
 
@@ -157,7 +158,7 @@ is_vhost_alive(VHost, {Username, _Password}, Pid) ->
     case rabbit_vhost_sup_sup:is_vhost_alive(VHost) of
         true  -> true;
         false ->
-            rabbit_log_connection:error(
+            ?LOG_ERROR(
                 "Error on direct client connection ~tp~n"
                 "access to vhost '~ts' refused for user '~ts': "
                 "vhost '~ts' is down",
@@ -173,15 +174,15 @@ is_over_vhost_connection_limit(VHost, {Username, _Password}, Pid) ->
     try rabbit_vhost_limit:is_over_connection_limit(VHost) of
         false         -> false;
         {true, Limit} ->
-            rabbit_log_connection:error(
+            ?LOG_ERROR(
                 "Error on direct client connection ~tp~n"
                 "access to vhost '~ts' refused for user '~ts': "
                 "vhost connection limit (~tp) is reached",
                 [Pid, VHost, PrintedUsername, Limit]),
             true
     catch
         throw:{error, {no_such_vhost, VHost}} ->
-            rabbit_log_connection:error(
+            ?LOG_ERROR(
                 "Error on direct client connection ~tp~n"
                 "vhost ~ts not found", [Pid, VHost]),
             true
@@ -211,7 +212,7 @@ connect1(User = #user{username = Username}, VHost, Protocol, Pid, Infos) ->
                     {error, Reason}
             end;
         {true, Limit} ->
-            rabbit_log_connection:error(
+            ?LOG_ERROR(
                 "Error on Direct connection ~tp~n"
                 "access refused for user '~ts': "
                 "user connection limit (~tp) is reached",
@@ -237,7 +238,7 @@ start_channel(Number, ClientChannelPid, ConnPid, ConnName, Protocol,
                     User, VHost, Capabilities, Collector, AmqpParams}]),
             {ok, ChannelPid};
         {true, Limit} ->
-            rabbit_log_connection:error(
+            ?LOG_ERROR(
                 "Error on direct connection ~tp~n"
                 "number of channels opened for user '~ts' has reached the "
                 "maximum allowed limit of (~w)",