Remove rabbit_log and switch to LOG_ macros

Author: mkuratczyk

deps/oauth2_client/src/oauth2_client.erl

@@ -17,12 +17,13 @@
         ]).
 
 -include("oauth2_client.hrl").
+-include_lib("kernel/include/logger.hrl").
 
 -spec get_access_token(oauth_provider(), access_token_request()) ->
     {ok, successful_access_token_response()} |
     {error, unsuccessful_access_token_response() | any()}.
 get_access_token(OAuthProvider, Request) ->
-    rabbit_log:debug("get_access_token using OAuthProvider:~p and client_id:~p",
+    ?LOG_DEBUG("get_access_token using OAuthProvider:~p and client_id:~p",
         [OAuthProvider, Request#access_token_request.client_id]),
         URL = OAuthProvider#oauth_provider.token_endpoint,
     Header = [],
@@ -96,7 +97,7 @@ drop_trailing_path_separator(Path) when is_list(Path) ->
 -spec get_openid_configuration(DiscoveryEndpoint :: uri_string:uri_string(),
     ssl:tls_option() | []) -> {ok, openid_configuration()} | {error, term()}.
 get_openid_configuration(DiscoverEndpoint, TLSOptions) ->
-    rabbit_log:debug("get_openid_configuration from ~p (~p)", [DiscoverEndpoint,
+    ?LOG_DEBUG("get_openid_configuration from ~p (~p)", [DiscoverEndpoint,
         format_ssl_options(TLSOptions)]),
     Options = [],
     Response = httpc:request(get, {DiscoverEndpoint, []}, TLSOptions, Options),
@@ -219,7 +220,7 @@ do_update_oauth_provider_endpoints_configuration(OAuthProvider) when
         undefined -> do_nothing;
         JwksUri -> set_env(jwks_uri, JwksUri)
     end,
-    rabbit_log:debug("Updated oauth_provider details: ~p ",
+    ?LOG_DEBUG("Updated oauth_provider details: ~p ",
         [format_oauth_provider(OAuthProvider)]),
     OAuthProvider;
 
@@ -230,7 +231,7 @@ do_update_oauth_provider_endpoints_configuration(OAuthProvider) ->
     ModifiedOAuthProviders = maps:put(OAuthProviderId,
         merge_oauth_provider(OAuthProvider, Proplist), OAuthProviders),
     set_env(oauth_providers, ModifiedOAuthProviders),
-    rabbit_log:debug("Replaced oauth_providers "),
+    ?LOG_DEBUG("Replaced oauth_providers "),
     OAuthProvider.
 
 use_global_locks_on_all_nodes() ->
@@ -271,7 +272,7 @@ get_oauth_provider(ListOfRequiredAttributes) ->
     case get_env(default_oauth_provider) of
         undefined -> get_root_oauth_provider(ListOfRequiredAttributes);
         DefaultOauthProviderId ->
-            rabbit_log:debug("Using default_oauth_provider ~p",
+            ?LOG_DEBUG("Using default_oauth_provider ~p",
                 [DefaultOauthProviderId]),
             get_oauth_provider(DefaultOauthProviderId, ListOfRequiredAttributes)
     end.
@@ -282,7 +283,7 @@ download_oauth_provider(OAuthProvider) ->
     case OAuthProvider#oauth_provider.discovery_endpoint of
         undefined -> {error, {missing_oauth_provider_attributes, [issuer]}};
         URL ->
-            rabbit_log:debug("Downloading oauth_provider using ~p ", [URL]),
+            ?LOG_DEBUG("Downloading oauth_provider using ~p ", [URL]),
             case get_openid_configuration(URL, get_ssl_options_if_any(OAuthProvider)) of
                 {ok, OpenIdConfiguration} ->
                     {ok, update_oauth_provider_endpoints_configuration(
@@ -294,7 +295,7 @@ download_oauth_provider(OAuthProvider) ->
 ensure_oauth_provider_has_attributes(OAuthProvider, ListOfRequiredAttributes) ->
     case find_missing_attributes(OAuthProvider, ListOfRequiredAttributes) of
         [] ->
-            rabbit_log:debug("Resolved oauth_provider ~p",
+            ?LOG_DEBUG("Resolved oauth_provider ~p",
                     [format_oauth_provider(OAuthProvider)]),
             {ok, OAuthProvider};
         _ = Attrs ->
@@ -303,13 +304,13 @@ ensure_oauth_provider_has_attributes(OAuthProvider, ListOfRequiredAttributes) ->
 
 get_root_oauth_provider(ListOfRequiredAttributes) ->
     OAuthProvider = lookup_root_oauth_provider(),
-    rabbit_log:debug("Using root oauth_provider ~p",
+    ?LOG_DEBUG("Using root oauth_provider ~p",
         [format_oauth_provider(OAuthProvider)]),
     case find_missing_attributes(OAuthProvider, ListOfRequiredAttributes) of
         [] ->
             {ok, OAuthProvider};
         _ = MissingAttributes ->
-            rabbit_log:debug("Looking up missing attributes ~p ...",
+            ?LOG_DEBUG("Looking up missing attributes ~p ...",
                 [MissingAttributes]),
             case download_oauth_provider(OAuthProvider) of
                 {ok, OAuthProvider2} ->
@@ -333,22 +334,22 @@ get_oauth_provider(OAuth2ProviderId, ListOfRequiredAttributes)
 
 get_oauth_provider(OAuthProviderId, ListOfRequiredAttributes)
         when is_binary(OAuthProviderId) ->
-    rabbit_log:debug("get_oauth_provider ~p with at least these attributes: ~p",
+    ?LOG_DEBUG("get_oauth_provider ~p with at least these attributes: ~p",
         [OAuthProviderId, ListOfRequiredAttributes]),
     case lookup_oauth_provider_config(OAuthProviderId) of
         {error, _} = Error0 ->
-            rabbit_log:debug("Failed to find oauth_provider ~p configuration due to ~p",
+            ?LOG_DEBUG("Failed to find oauth_provider ~p configuration due to ~p",
                 [OAuthProviderId, Error0]),
             Error0;
         Config ->
-            rabbit_log:debug("Found oauth_provider configuration ~p", [Config]),
+            ?LOG_DEBUG("Found oauth_provider configuration ~p", [Config]),
             OAuthProvider = map_to_oauth_provider(Config),
-            rabbit_log:debug("Resolved oauth_provider ~p", [format_oauth_provider(OAuthProvider)]),
+            ?LOG_DEBUG("Resolved oauth_provider ~p", [format_oauth_provider(OAuthProvider)]),
             case find_missing_attributes(OAuthProvider, ListOfRequiredAttributes) of
                 [] ->
                     {ok, OAuthProvider};
                 _ = MissingAttributes ->
-                    rabbit_log:debug("OauthProvider has following missing attributes ~p", [MissingAttributes]),
+                    ?LOG_DEBUG("OauthProvider has following missing attributes ~p", [MissingAttributes]),
                     case download_oauth_provider(OAuthProvider) of
                         {ok, OAuthProvider2} ->
                             ensure_oauth_provider_has_attributes(OAuthProvider2,

deps/rabbit/include/rabbit_amqp.hrl

@@ -3,7 +3,7 @@
 -ifdef(TRACE_AMQP).
 -warning("AMQP tracing is enabled").
 -define(TRACE(Format, Args),
-        rabbit_log:debug(
+        ?LOG_DEBUG(
           "~s:~s/~b ~b~n" ++ Format ++ "~n",
           [?MODULE, ?FUNCTION_NAME, ?FUNCTION_ARITY, ?LINE] ++ Args)).
 -else.

deps/rabbit/src/code_server_cache.erl

@@ -9,6 +9,8 @@
 
 -module(code_server_cache).
 
+-include_lib("kernel/include/logger.hrl").
+
 -behaviour(gen_server).
 
 %% API
@@ -70,7 +72,7 @@ handle_maybe_call_mfa(true, {Module, Function, Args, Default}, State) ->
         error:undef ->
             handle_maybe_call_mfa_error(Module, Default, State);
         Err:Reason ->
-            rabbit_log:error("Calling ~tp:~tp failed: ~tp:~tp",
+            ?LOG_ERROR("Calling ~tp:~tp failed: ~tp:~tp",
                              [Module, Function, Err, Reason]),
             handle_maybe_call_mfa_error(Module, Default, State)
     end.

deps/rabbit/src/file_handle_cache.erl

@@ -7,6 +7,8 @@
 
 -module(file_handle_cache).
 
+-include_lib("kernel/include/logger.hrl").
+
 %% A File Handle Cache
 %%
 %% This extends a subset of the functionality of the Erlang file
@@ -1451,35 +1453,35 @@ update_counts(open, Pid, Delta,
               State = #fhc_state { open_count          = OpenCount,
                                    clients             = Clients }) ->
     safe_ets_update_counter(Clients, Pid, {#cstate.opened, Delta},
-      fun() -> rabbit_log:warning("FHC: failed to update counter 'opened', client pid: ~p", [Pid]) end),
+      fun() -> ?LOG_WARNING("FHC: failed to update counter 'opened', client pid: ~p", [Pid]) end),
     State #fhc_state { open_count = OpenCount + Delta};
 update_counts({obtain, file}, Pid, Delta,
               State = #fhc_state {obtain_count_file   = ObtainCountF,
                                   clients             = Clients }) ->
   safe_ets_update_counter(Clients, Pid, {#cstate.obtained_file, Delta},
-      fun() -> rabbit_log:warning("FHC: failed to update counter 'obtained_file', client pid: ~p", [Pid]) end),
+      fun() -> ?LOG_WARNING("FHC: failed to update counter 'obtained_file', client pid: ~p", [Pid]) end),
     State #fhc_state { obtain_count_file = ObtainCountF + Delta};
 update_counts({obtain, socket}, Pid, Delta,
               State = #fhc_state {obtain_count_socket   = ObtainCountS,
                                   clients             = Clients }) ->
   safe_ets_update_counter(Clients, Pid, {#cstate.obtained_socket, Delta},
-    fun() -> rabbit_log:warning("FHC: failed to update counter 'obtained_socket', client pid: ~p", [Pid]) end),
+    fun() -> ?LOG_WARNING("FHC: failed to update counter 'obtained_socket', client pid: ~p", [Pid]) end),
     State #fhc_state { obtain_count_socket = ObtainCountS + Delta};
 update_counts({reserve, file}, Pid, NewReservation,
               State = #fhc_state {reserve_count_file   = ReserveCountF,
                                   clients             = Clients }) ->
     [#cstate{reserved_file = R}] = ets:lookup(Clients, Pid),
     Delta = NewReservation - R,
   safe_ets_update_counter(Clients, Pid, {#cstate.reserved_file, Delta},
-    fun() -> rabbit_log:warning("FHC: failed to update counter 'reserved_file', client pid: ~p", [Pid]) end),
+    fun() -> ?LOG_WARNING("FHC: failed to update counter 'reserved_file', client pid: ~p", [Pid]) end),
     State #fhc_state { reserve_count_file = ReserveCountF + Delta};
 update_counts({reserve, socket}, Pid, NewReservation,
               State = #fhc_state {reserve_count_socket   = ReserveCountS,
                                   clients             = Clients }) ->
     [#cstate{reserved_file = R}] = ets:lookup(Clients, Pid),
     Delta = NewReservation - R,
   safe_ets_update_counter(Clients, Pid, {#cstate.reserved_socket, Delta},
-    fun() -> rabbit_log:warning("FHC: failed to update counter 'reserved_socket', client pid: ~p", [Pid]) end),
+    fun() -> ?LOG_WARNING("FHC: failed to update counter 'reserved_socket', client pid: ~p", [Pid]) end),
     State #fhc_state { reserve_count_socket = ReserveCountS + Delta}.
 
 maybe_reduce(State) ->

deps/rabbit/src/mc_compat.erl

@@ -3,6 +3,7 @@
 -include_lib("rabbit_common/include/rabbit.hrl").
 -include_lib("rabbit_common/include/rabbit_framing.hrl").
 -include("mc.hrl").
+-include_lib("kernel/include/logger.hrl").
 
 -export([
          %init/3,
@@ -267,7 +268,7 @@ update_x_death_header(Info, Headers) ->
               Headers, <<"x-death">>, array,
               [{table, rabbit_misc:sort_field_table(Info1)} | Others]);
         {<<"x-death">>, InvalidType, Header} ->
-            rabbit_log:warning("Message has invalid x-death header (type: ~tp)."
+            ?LOG_WARNING("Message has invalid x-death header (type: ~tp)."
                                " Resetting header ~tp",
                                [InvalidType, Header]),
             %% if x-death is something other than an array (list)

deps/rabbit/src/mirrored_supervisor.erl

@@ -7,6 +7,8 @@
 
 -module(mirrored_supervisor).
 
+-include_lib("kernel/include/logger.hrl").
+
 %% Mirrored Supervisor
 %% ===================
 %%
@@ -252,13 +254,13 @@ handle_call({init, Overall}, _From,
     LockId = mirrored_supervisor_locks:lock(Group),
     maybe_log_lock_acquisition_failure(LockId, Group),
     ok = pg:join(Group, Overall),
-    rabbit_log:debug("Mirrored supervisor: initializing, overall supervisor ~tp joined group ~tp", [Overall, Group]),
+    ?LOG_DEBUG("Mirrored supervisor: initializing, overall supervisor ~tp joined group ~tp", [Overall, Group]),
     Rest = pg:get_members(Group) -- [Overall],
     Nodes = [node(M) || M <- Rest],
-    rabbit_log:debug("Mirrored supervisor: known group ~tp members: ~tp on nodes ~tp", [Group, Rest, Nodes]),
+    ?LOG_DEBUG("Mirrored supervisor: known group ~tp members: ~tp on nodes ~tp", [Group, Rest, Nodes]),
     case Rest of
         [] ->
-            rabbit_log:debug("Mirrored supervisor: no known peer members in group ~tp, will delete all child records for it", [Group]),
+            ?LOG_DEBUG("Mirrored supervisor: no known peer members in group ~tp, will delete all child records for it", [Group]),
             delete_all(Group);
         _  -> ok
     end,
@@ -282,18 +284,18 @@ handle_call({start_child, ChildSpec}, _From,
                            group    = Group}) ->
     LockId = mirrored_supervisor_locks:lock(Group),
     maybe_log_lock_acquisition_failure(LockId, Group),
-    rabbit_log:debug("Mirrored supervisor: asked to consider starting a child, group: ~tp", [Group]),
+    ?LOG_DEBUG("Mirrored supervisor: asked to consider starting a child, group: ~tp", [Group]),
     Result = case maybe_start(Group, Overall, Delegate, ChildSpec) of
                  already_in_store ->
-                     rabbit_log:debug("Mirrored supervisor: maybe_start for group ~tp,"
+                     ?LOG_DEBUG("Mirrored supervisor: maybe_start for group ~tp,"
                                       " overall ~p returned 'record already present'", [Group, Overall]),
                      {error, already_present};
                  {already_in_store, Pid} ->
-                     rabbit_log:debug("Mirrored supervisor: maybe_start for group ~tp,"
+                     ?LOG_DEBUG("Mirrored supervisor: maybe_start for group ~tp,"
                                       " overall ~p returned 'already running: ~tp'", [Group, Overall, Pid]),
                      {error, {already_started, Pid}};
                  Else ->
-                     rabbit_log:debug("Mirrored supervisor: maybe_start for group ~tp,"
+                     ?LOG_DEBUG("Mirrored supervisor: maybe_start for group ~tp,"
                                       " overall ~tp returned ~tp", [Group, Overall, Else]),
                      Else
              end,
@@ -377,19 +379,19 @@ tell_all_peers_to_die(Group, Reason) ->
     [cast(P, {die, Reason}) || P <- pg:get_members(Group) -- [self()]].
 
 maybe_start(Group, Overall, Delegate, ChildSpec) ->
-    rabbit_log:debug("Mirrored supervisor: asked to consider starting, group: ~tp",
+    ?LOG_DEBUG("Mirrored supervisor: asked to consider starting, group: ~tp",
                      [Group]),
     try check_start(Group, Overall, Delegate, ChildSpec) of
         start      ->
-            rabbit_log:debug("Mirrored supervisor: check_start for group ~tp,"
+            ?LOG_DEBUG("Mirrored supervisor: check_start for group ~tp,"
                              " overall ~tp returned 'do start'", [Group, Overall]),
             start(Delegate, ChildSpec);
         undefined  ->
-            rabbit_log:debug("Mirrored supervisor: check_start for group ~tp,"
+            ?LOG_DEBUG("Mirrored supervisor: check_start for group ~tp,"
                              " overall ~tp returned 'undefined'", [Group, Overall]),
             already_in_store;
         Pid ->
-            rabbit_log:debug("Mirrored supervisor: check_start for group ~tp,"
+            ?LOG_DEBUG("Mirrored supervisor: check_start for group ~tp,"
                              " overall ~tp returned 'already running (~tp)'",
                              [Group, Overall, Pid]),
             {already_in_store, Pid}
@@ -400,7 +402,7 @@ maybe_start(Group, Overall, Delegate, ChildSpec) ->
 
 check_start(Group, Overall, Delegate, ChildSpec) ->
     Id = id(ChildSpec),
-    rabbit_log:debug("Mirrored supervisor: check_start for group ~tp, id: ~tp, "
+    ?LOG_DEBUG("Mirrored supervisor: check_start for group ~tp, id: ~tp, "
                      "overall: ~tp", [Group, Id, Overall]),
     case rabbit_db_msup:create_or_update(Group, Overall, Delegate, ChildSpec, Id) of
         Delegate0 when is_pid(Delegate0) ->
@@ -486,6 +488,6 @@ restore_child_order(ChildSpecs, ChildOrder) ->
                end, ChildSpecs).
 
 maybe_log_lock_acquisition_failure(undefined = _LockId, Group) ->
-    rabbit_log:warning("Mirrored supervisor: could not acquire lock for group ~ts", [Group]);
+    ?LOG_WARNING("Mirrored supervisor: could not acquire lock for group ~ts", [Group]);
 maybe_log_lock_acquisition_failure(_, _) ->
     ok.

deps/rabbit/src/rabbit.erl

@@ -1688,7 +1688,7 @@ maybe_warn_low_fd_limit() ->
         L when L > 1024 ->
             ok;
         L ->
-            rabbit_log:warning("Available file handles: ~tp. "
+            ?LOG_WARNING("Available file handles: ~tp. "
                 "Please consider increasing system limits", [L])
     end.
 
@@ -1718,7 +1718,7 @@ persist_static_configuration() ->
                             MoreCreditAfter =< InitialCredit ->
                          {InitialCredit, MoreCreditAfter};
                      Other ->
-                       rabbit_log:error("Refusing to boot due to an invalid value of 'rabbit.credit_flow_default_credit'"),
+                       ?LOG_ERROR("Refusing to boot due to an invalid value of 'rabbit.credit_flow_default_credit'"),
                        throw({error, {invalid_credit_flow_default_credit_value, Other}})
                end,
     ok = persistent_term:put(credit_flow_default_credit, CreditFlowDefaultCredit),

deps/rabbit/src/rabbit_access_control.erl

@@ -8,6 +8,7 @@
 -module(rabbit_access_control).
 
 -include_lib("rabbit_common/include/rabbit.hrl").
+-include_lib("kernel/include/logger.hrl").
 
 -export([check_user_pass_login/2, check_user_login/2, check_user_login/3, check_user_loopback/2,
          check_vhost_access/4, check_resource_access/4, check_topic_access/4,
@@ -59,10 +60,10 @@ check_user_login(Username, AuthProps, Modules) ->
                     %% it gives us
                     case try_authenticate(Mod, Username, AuthProps) of
                         {ok, ModNUser = #auth_user{username = Username2, impl = Impl}} ->
-                            rabbit_log:debug("User '~ts' authenticated successfully by backend ~ts", [Username2, Mod]),
+                            ?LOG_DEBUG("User '~ts' authenticated successfully by backend ~ts", [Username2, Mod]),
                             user(ModNUser, {ok, [{Mod, Impl}], []});
                         Else ->
-                            rabbit_log:debug("User '~ts' failed authentication by backend ~ts", [Username, Mod]),
+                            ?LOG_DEBUG("User '~ts' failed authentication by backend ~ts", [Username, Mod]),
                             Else
                     end;
                 (_, {ok, User}) ->
@@ -72,7 +73,7 @@ check_user_login(Username, AuthProps, Modules) ->
             {refused, Username, "No modules checked '~ts'", [Username]}, Modules)
         catch
             Type:Error:Stacktrace ->
-                rabbit_log:debug("User '~ts' authentication failed with ~ts:~tp:~n~tp", [Username, Type, Error, Stacktrace]),
+                ?LOG_DEBUG("User '~ts' authentication failed with ~ts:~tp:~n~tp", [Username, Type, Error, Stacktrace]),
                 {refused, Username, "User '~ts' authentication failed with internal error. "
                                     "Enable debug logs to see the real error.", [Username]}
 
@@ -85,7 +86,7 @@ try_authenticate_and_try_authorize(ModN, ModZs0, Username, AuthProps) ->
             end,
     case try_authenticate(ModN, Username, AuthProps) of
         {ok, ModNUser = #auth_user{username = Username2}} ->
-            rabbit_log:debug("User '~ts' authenticated successfully by backend ~ts", [Username2, ModN]),
+            ?LOG_DEBUG("User '~ts' authenticated successfully by backend ~ts", [Username2, ModN]),
             user(ModNUser, try_authorize(ModZs, Username2, AuthProps));
         Else ->
             Else
@@ -227,7 +228,7 @@ check_access(Fun, Module, ErrStr, ErrArgs, ErrName) ->
         {error, E}  ->
             FullErrStr = ErrStr ++ ", backend ~ts returned an error: ~tp",
             FullErrArgs = ErrArgs ++ [Module, E],
-            rabbit_log:error(FullErrStr, FullErrArgs),
+            ?LOG_ERROR(FullErrStr, FullErrArgs),
             rabbit_misc:protocol_error(ErrName, FullErrStr, FullErrArgs)
     end.