[skip ci] Remove rabbit_log_ldad and use LOG_ macros

Author: mkuratczyk

deps/rabbitmq_auth_backend_ldap/src/rabbit_auth_backend_ldap.erl

@@ -11,6 +11,8 @@
 
 -include_lib("eldap/include/eldap.hrl").
 -include_lib("rabbit_common/include/rabbit.hrl").
+-include_lib("kernel/include/logger.hrl").
+-include("logging.hrl").
 
 -behaviour(rabbit_authn_backend).
 -behaviour(rabbit_authz_backend).
@@ -514,18 +516,16 @@ with_ldap({ok, Creds}, Fun, Servers) ->
     Opts1 = case env(log) of
                 network ->
                     Pre = "    LDAP network traffic: ",
-                    rabbit_log_ldap:info(
-                      "    LDAP connecting to servers: ~tp", [Servers]),
-                    [{log, fun(1, S, A) -> rabbit_log_ldap:warning(Pre ++ S, A);
+                    ?LOG_INFO("LDAP connecting to servers: ~tp", [Servers]),
+                    [{log, fun(1, S, A) -> ?LOG_WARNING(Pre ++ S, A);
                               (2, S, A) ->
-                                   rabbit_log_ldap:info(Pre ++ S, scrub_creds(A, []))
+                                   ?LOG_INFO(Pre ++ S, scrub_creds(A, []))
                            end} | Opts0];
                 network_unsafe ->
                     Pre = "    LDAP network traffic: ",
-                    rabbit_log_ldap:info(
-                      "    LDAP connecting to servers: ~tp", [Servers]),
-                    [{log, fun(1, S, A) -> rabbit_log_ldap:warning(Pre ++ S, A);
-                              (2, S, A) -> rabbit_log_ldap:info(   Pre ++ S, A)
+                    ?LOG_INFO("    LDAP connecting to servers: ~tp", [Servers]),
+                    [{log, fun(1, S, A) -> ?LOG_WARNING(Pre ++ S, A);
+                              (2, S, A) -> ?LOG_INFO(   Pre ++ S, A)
                            end} | Opts0];
                 _ ->
                     Opts0
@@ -550,7 +550,7 @@ with_ldap({ok, Creds}, Fun, Servers) ->
 with_login(Creds, Servers, Opts, Fun) ->
     with_login(Creds, Servers, Opts, Fun, ?LDAP_OPERATION_RETRIES).
 with_login(_Creds, _Servers, _Opts, _Fun, 0 = _RetriesLeft) ->
-    rabbit_log_ldap:warning("LDAP failed to perform an operation. TCP connection to a LDAP server was closed or otherwise defunct. Exhausted all retries."),
+    ?LOG_WARNING("LDAP failed to perform an operation. TCP connection to a LDAP server was closed or otherwise defunct. Exhausted all retries."),
     {error, ldap_connect_error};
 with_login(Creds, Servers, Opts, Fun, RetriesLeft) ->
     case get_or_create_conn(Creds == anon, Servers, Opts) of
@@ -609,9 +609,9 @@ with_login(Creds, Servers, Opts, Fun, RetriesLeft) ->
 
 purge_connection(Creds, Servers, Opts) ->
     %% purge and retry with a new connection
-    rabbit_log_ldap:warning("TCP connection to a LDAP server was closed or otherwise defunct."),
+    ?LOG_WARNING("TCP connection to a LDAP server was closed or otherwise defunct."),
     purge_conn(Creds == anon, Servers, Opts),
-    rabbit_log_ldap:warning("LDAP will retry with a new connection.").
+    ?LOG_WARNING("LDAP will retry with a new connection.").
 
 call_ldap_fun(Fun, LDAP) ->
     call_ldap_fun(Fun, LDAP, "").
@@ -725,7 +725,7 @@ purge_conn(IsAnon, Servers, Opts) ->
     Conns = get(ldap_conns),
     Key = {IsAnon, Servers, Opts},
     {ok, Conn} = maps:find(Key, Conns),
-    rabbit_log_ldap:warning("LDAP will purge an already closed or defunct LDAP server connection from the pool"),
+    ?LOG_WARNING("LDAP will purge an already closed or defunct LDAP server connection from the pool"),
     % We cannot close the connection with eldap:close/1 because as of OTP-13327
     % eldap will try to do_unbind first and will fail with a `{gen_tcp_error, closed}`.
     % Since we know that the connection is already closed, we just
@@ -770,7 +770,7 @@ ssl_options() ->
     Opts0 = rabbit_ssl_options:fix_client(env(ssl_options)),
     case env(ssl_hostname_verification, undefined) of
         wildcard ->
-            rabbit_log_ldap:debug("Enabling wildcard-aware hostname verification for LDAP client connections"),
+            ?LOG_DEBUG("Enabling wildcard-aware hostname verification for LDAP client connections"),
             %% Needed for non-HTTPS connections that connect to servers that use wildcard certificates.
             %% See https://erlang.org/doc/man/public_key.html#pkix_verify_hostname_match_fun-1.
             [{customize_hostname_check, [{match_fun, public_key:pkix_verify_hostname_match_fun(https)}]} | Opts0];
@@ -786,7 +786,7 @@ at_least(Ver) ->
 get_expected_env_str(Key, Default) ->
     V = case env(Key) of
             Default ->
-                rabbit_log_ldap:warning("rabbitmq_auth_backend_ldap configuration key '~tp' is set to "
+                ?LOG_WARNING("rabbitmq_auth_backend_ldap configuration key '~tp' is set to "
                                         "the default value of '~tp', expected to get a non-default value",
                                         [Key, Default]),
                 Default;
@@ -884,7 +884,7 @@ dn_lookup(Username, LDAP) ->
             ?L1("DN lookup: ~ts -> ~ts", [Username, DN]),
             DN;
         {ok, {eldap_search_result, Entries, _Referrals, _Controls}} ->
-            rabbit_log_ldap:warning("Searching for DN for ~ts, got back ~tp",
+            ?LOG_WARNING("Searching for DN for ~ts, got back ~tp",
                                [Filled, Entries]),
             Filled;
         {error, _} = E ->
@@ -963,7 +963,7 @@ is_dn(_S) -> false.
 
 log(Fmt,  Args) -> case env(log) of
                        false -> ok;
-                       _     -> rabbit_log_ldap:info(Fmt ++ "", Args)
+                       _     -> ?LOG_INFO(Fmt ++ "", Args)
                    end.
 
 fill(Fmt, Args) ->

deps/rabbitmq_auth_backend_ldap/src/rabbit_auth_backend_ldap_app.erl

@@ -10,6 +10,9 @@
 -behaviour(application).
 -export([start/2, stop/1]).
 
+-include_lib("kernel/include/logger.hrl").
+-include("logging.hrl").
+
 %% Dummy supervisor - see Ulf Wiger's comment at
 %% http://erlang.org/pipermail/erlang-questions/2010-April/050508.html
 -behaviour(supervisor).
@@ -28,7 +31,7 @@ start(_Type, _StartArgs) ->
     {ok, Backends} = application:get_env(rabbit, auth_backends),
     case configured(rabbit_auth_backend_ldap, Backends) of
         true  -> ok;
-        false -> rabbit_log_ldap:warning(
+        false -> ?LOG_WARNING(
                    "LDAP plugin loaded, but rabbit_auth_backend_ldap is not "
                    "in the list of auth_backends. LDAP auth will not work.")
     end,
@@ -53,4 +56,6 @@ configured(M,  [_    |T]) -> configured(M, T).
 
 %%----------------------------------------------------------------------------
 
-init([]) -> {ok, {{one_for_one, 3, 10}, []}}.
+init([]) ->
+    logger:set_process_metadata(#{domain => ?RMQLOG_DOMAIN_LDAP}),
+    {ok, {{one_for_one, 3, 10}, []}}.