Skip to content

Commit eaea071

Browse files
Michal Kuratczykmkuratczyk
Michal Kuratczyk
authored and
mkuratczyk
committed
Use LOG macros in remaining places
1 parent 3eda2c2 commit eaea071

10 files changed

+67
-60
lines changed

‎deps/rabbit/src/rabbit_khepri.erl‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -683,51 +683,51 @@ dir() ->
683683
%% @private
684684

685685
transfer_leadership([]) ->
686-
rabbit_log:warning("Skipping leadership transfer of metadata store: no candidate "
687-
"(online, not under maintenance) nodes to transfer to!");
686+
?LOG_WARNING("Skipping leadership transfer of metadata store: no candidate "
687+
"(online, not under maintenance) nodes to transfer to!");
688688
transfer_leadership(TransferCandidates) ->
689689
case get_feature_state() of
690690
enabled ->
691691
transfer_leadership0(TransferCandidates);
692692
_ ->
693-
rabbit_log:info("Skipping leadership transfer of metadata store: Khepri is not enabled")
693+
?LOG_INFO("Skipping leadership transfer of metadata store: Khepri is not enabled")
694694
end.
695695

696696
-spec transfer_leadership0([node()]) ->
697697
{ok, in_progress | undefined | node()} | {error, any()}.
698698
transfer_leadership0([]) ->
699-
rabbit_log:warning("Khepri clustering: failed to transfer leadership, no more candidates available", []),
699+
?LOG_WARNING("Khepri clustering: failed to transfer leadership, no more candidates available", []),
700700
{error, not_migrated};
701701
transfer_leadership0([Destination | TransferCandidates]) ->
702-
rabbit_log:info("Khepri clustering: transferring leadership to node ~p", [Destination]),
702+
?LOG_INFO("Khepri clustering: transferring leadership to node ~p", [Destination]),
703703
case ra_leaderboard:lookup_leader(?STORE_ID) of
704704
{Name, Node} = Id when Node == node() ->
705705
Timeout = khepri_app:get_default_timeout(),
706706
case ra:transfer_leadership(Id, {Name, Destination}) of
707707
ok ->
708708
case ra:members(Id, Timeout) of
709709
{_, _, {_, NewNode}} ->
710-
rabbit_log:info("Khepri clustering: successfully transferred leadership to node ~p", [Destination]),
710+
?LOG_INFO("Khepri clustering: successfully transferred leadership to node ~p", [Destination]),
711711
{ok, NewNode};
712712
{timeout, _} ->
713-
rabbit_log:warning("Khepri clustering: maybe failed to transfer leadership to node ~p, members query has timed out", [Destination]),
713+
?LOG_WARNING("Khepri clustering: maybe failed to transfer leadership to node ~p, members query has timed out", [Destination]),
714714
{error, not_migrated}
715715
end;
716716
already_leader ->
717-
rabbit_log:info("Khepri clustering: successfully transferred leadership to node ~p, already the leader", [Destination]),
717+
?LOG_INFO("Khepri clustering: successfully transferred leadership to node ~p, already the leader", [Destination]),
718718
{ok, Destination};
719719
{error, Reason} ->
720-
rabbit_log:warning("Khepri clustering: failed to transfer leadership to node ~p with the following error ~p", [Destination, Reason]),
720+
?LOG_WARNING("Khepri clustering: failed to transfer leadership to node ~p with the following error ~p", [Destination, Reason]),
721721
transfer_leadership0(TransferCandidates);
722722
{timeout, _} ->
723-
rabbit_log:warning("Khepri clustering: failed to transfer leadership to node ~p with a timeout", [Destination]),
723+
?LOG_WARNING("Khepri clustering: failed to transfer leadership to node ~p with a timeout", [Destination]),
724724
transfer_leadership0(TransferCandidates)
725725
end;
726726
{_, Node} ->
727-
rabbit_log:info("Khepri clustering: skipping leadership transfer, leader is already in node ~p", [Node]),
727+
?LOG_INFO("Khepri clustering: skipping leadership transfer, leader is already in node ~p", [Node]),
728728
{ok, Node};
729729
undefined ->
730-
rabbit_log:info("Khepri clustering: skipping leadership transfer, leader not elected", []),
730+
?LOG_INFO("Khepri clustering: skipping leadership transfer, leader not elected", []),
731731
{ok, undefined}
732732
end.
733733

‎deps/rabbit/src/rabbit_maintenance.erl‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -189,29 +189,29 @@ close_all_client_connections() ->
189189

190190
-spec transfer_leadership_of_quorum_queues([node()]) -> ok.
191191
transfer_leadership_of_quorum_queues([]) ->
192-
rabbit_log:warning("Skipping leadership transfer of quorum queues: no candidate "
193-
"(online, not under maintenance) nodes to transfer to!");
192+
?LOG_WARNING("Skipping leadership transfer of quorum queues: no candidate "
193+
"(online, not under maintenance) nodes to transfer to!");
194194
transfer_leadership_of_quorum_queues(_TransferCandidates) ->
195195
%% we only transfer leadership for QQs that have local leaders
196196
Queues = rabbit_amqqueue:list_local_leaders(),
197-
rabbit_log:info("Will transfer leadership of ~b quorum queues with current leader on this node",
198-
[length(Queues)]),
197+
?LOG_INFO("Will transfer leadership of ~b quorum queues with current leader on this node",
198+
[length(Queues)]),
199199
[begin
200200
Name = amqqueue:get_name(Q),
201-
rabbit_log:debug("Will trigger a leader election for local quorum queue ~ts",
202-
[rabbit_misc:rs(Name)]),
201+
?LOG_DEBUG("Will trigger a leader election for local quorum queue ~ts",
202+
[rabbit_misc:rs(Name)]),
203203
%% we trigger an election and exclude this node from the list of candidates
204204
%% by simply shutting its local QQ replica (Ra server)
205205
RaLeader = amqqueue:get_pid(Q),
206-
rabbit_log:debug("Will stop Ra server ~tp", [RaLeader]),
206+
?LOG_DEBUG("Will stop Ra server ~tp", [RaLeader]),
207207
case rabbit_quorum_queue:stop_server(RaLeader) of
208208
ok ->
209-
rabbit_log:debug("Successfully stopped Ra server ~tp", [RaLeader]);
209+
?LOG_DEBUG("Successfully stopped Ra server ~tp", [RaLeader]);
210210
{error, nodedown} ->
211-
rabbit_log:error("Failed to stop Ra server ~tp: target node was reported as down")
211+
?LOG_ERROR("Failed to stop Ra server ~tp: target node was reported as down")
212212
end
213213
end || Q <- Queues],
214-
rabbit_log:info("Leadership transfer for quorum queues hosted on this node has been initiated").
214+
?LOG_INFO("Leadership transfer for quorum queues hosted on this node has been initiated").
215215

216216
transfer_leadership_of_metadata_store(TransferCandidates) ->
217217
?LOG_INFO("Will transfer leadership of metadata store with current leader on this node",
@@ -227,8 +227,8 @@ transfer_leadership_of_metadata_store(TransferCandidates) ->
227227

228228
-spec transfer_leadership_of_stream_coordinator([node()]) -> ok.
229229
transfer_leadership_of_stream_coordinator([]) ->
230-
rabbit_log:warning("Skipping leadership transfer of stream coordinator: no candidate "
231-
"(online, not under maintenance) nodes to transfer to!");
230+
?LOG_WARNING("Skipping leadership transfer of stream coordinator: no candidate "
231+
"(online, not under maintenance) nodes to transfer to!");
232232
transfer_leadership_of_stream_coordinator(TransferCandidates) ->
233233
% try to transfer to the node with the lowest uptime; the assumption is that
234234
% nodes are usually restarted in a rolling fashion, in a consistent order;
@@ -239,32 +239,32 @@ transfer_leadership_of_stream_coordinator(TransferCandidates) ->
239239
BestCandidate = element(1, hd(lists:keysort(2, Candidates))),
240240
case rabbit_stream_coordinator:transfer_leadership([BestCandidate]) of
241241
{ok, Node} ->
242-
rabbit_log:info("Leadership transfer for stream coordinator completed. The new leader is ~p", [Node]);
242+
?LOG_INFO("Leadership transfer for stream coordinator completed. The new leader is ~p", [Node]);
243243
Error ->
244-
rabbit_log:warning("Skipping leadership transfer of stream coordinator: ~p", [Error])
244+
?LOG_WARNING("Skipping leadership transfer of stream coordinator: ~p", [Error])
245245
end.
246246

247247
-spec stop_local_quorum_queue_followers() -> ok.
248248
stop_local_quorum_queue_followers() ->
249249
Queues = rabbit_amqqueue:list_local_followers(),
250-
rabbit_log:info("Will stop local follower replicas of ~b quorum queues on this node",
251-
[length(Queues)]),
250+
?LOG_INFO("Will stop local follower replicas of ~b quorum queues on this node",
251+
[length(Queues)]),
252252
[begin
253253
Name = amqqueue:get_name(Q),
254-
rabbit_log:debug("Will stop a local follower replica of quorum queue ~ts",
255-
[rabbit_misc:rs(Name)]),
254+
?LOG_DEBUG("Will stop a local follower replica of quorum queue ~ts",
255+
[rabbit_misc:rs(Name)]),
256256
%% shut down Ra nodes so that they are not considered for leader election
257257
{RegisteredName, _LeaderNode} = amqqueue:get_pid(Q),
258258
RaNode = {RegisteredName, node()},
259-
rabbit_log:debug("Will stop Ra server ~tp", [RaNode]),
259+
?LOG_DEBUG("Will stop Ra server ~tp", [RaNode]),
260260
case rabbit_quorum_queue:stop_server(RaNode) of
261261
ok ->
262-
rabbit_log:debug("Successfully stopped Ra server ~tp", [RaNode]);
262+
?LOG_DEBUG("Successfully stopped Ra server ~tp", [RaNode]);
263263
{error, nodedown} ->
264-
rabbit_log:error("Failed to stop Ra server ~tp: target node was reported as down")
264+
?LOG_ERROR("Failed to stop Ra server ~tp: target node was reported as down")
265265
end
266266
end || Q <- Queues],
267-
rabbit_log:info("Stopped all local replicas of quorum queues hosted on this node").
267+
?LOG_INFO("Stopped all local replicas of quorum queues hosted on this node").
268268

269269
-spec primary_replica_transfer_candidate_nodes() -> [node()].
270270
primary_replica_transfer_candidate_nodes() ->
@@ -295,17 +295,17 @@ revive_local_quorum_queue_replicas() ->
295295
%% NB: this function ignores the first argument so we can just pass the
296296
%% empty binary as the vhost name.
297297
{Recovered, Failed} = rabbit_quorum_queue:recover(<<>>, Queues),
298-
rabbit_log:debug("Successfully revived ~b quorum queue replicas",
299-
[length(Recovered)]),
298+
?LOG_DEBUG("Successfully revived ~b quorum queue replicas",
299+
[length(Recovered)]),
300300
case length(Failed) of
301301
0 ->
302302
ok;
303303
NumFailed ->
304-
rabbit_log:error("Failed to revive ~b quorum queue replicas",
305-
[NumFailed])
304+
?LOG_ERROR("Failed to revive ~b quorum queue replicas",
305+
[NumFailed])
306306
end,
307307

308-
rabbit_log:info("Restart of local quorum queue replicas is complete"),
308+
?LOG_INFO("Restart of local quorum queue replicas is complete"),
309309
ok.
310310

311311
%%

‎deps/rabbit/src/rabbit_queue_type.erl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ discover(Other) when is_atom(Other) ->
294294
discover(rabbit_data_coercion:to_binary(Other));
295295
discover(Other) when is_binary(Other) ->
296296
T = rabbit_registry:binary_to_type(Other),
297-
rabbit_log:debug("Queue type discovery: will look up a module for type '~tp'", [T]),
297+
?LOG_DEBUG("Queue type discovery: will look up a module for type '~tp'", [T]),
298298
{ok, Mod} = rabbit_registry:lookup_module(queue, T),
299299
Mod.
300300

‎deps/rabbit/src/rabbit_quorum_queue_periodic_membership_reconciliation.erl‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2,
2020
code_change/3]).
2121

22+
-include_lib("kernel/include/logger.hrl").
23+
2224
-define(SERVER, ?MODULE).
2325
-define(DEFAULT_INTERVAL, 60_000*60).
2426
-define(DEFAULT_TRIGGER_INTERVAL, 10_000).
@@ -91,8 +93,8 @@ handle_cast({membership_reconciliation_trigger, _Reason}, #state{enabled = false
9193
{noreply, State, hibernate};
9294
handle_cast({membership_reconciliation_trigger, Reason}, #state{timer_ref = OldRef,
9395
trigger_interval = Time} = State) ->
94-
rabbit_log:debug("Quorum Queue membership reconciliation triggered: ~p",
95-
[Reason]),
96+
?LOG_DEBUG("Quorum Queue membership reconciliation triggered: ~p",
97+
[Reason]),
9698
_ = erlang:cancel_timer(OldRef),
9799
Ref = erlang:send_after(Time, self(), ?EVAL_MSG),
98100
{noreply, State#state{timer_ref = Ref}};
@@ -158,7 +160,7 @@ reconciliate_quorum_members(ExpectedNodes, Running, [Q | LocalLeaders],
158160
end
159161
else
160162
{timeout, Reason} ->
161-
rabbit_log:debug("Find leader timeout: ~p", [Reason]),
163+
?LOG_DEBUG("Find leader timeout: ~p", [Reason]),
162164
ok;
163165
_ ->
164166
noop
@@ -184,15 +186,15 @@ maybe_add_member(Q, Running, MemberNodes, TargetSize) ->
184186
QName = amqqueue:get_name(Q),
185187
case rabbit_quorum_queue:add_member(Q, Node) of
186188
ok ->
187-
rabbit_log:debug(
188-
"Added node ~ts as a member to ~ts as "
189-
"the queues target group size(#~w) is not met and "
190-
"there are enough new nodes(#~w) in the cluster",
191-
[Node, rabbit_misc:rs(QName), TargetSize, length(New)]);
189+
?LOG_DEBUG(
190+
"Added node ~ts as a member to ~ts as "
191+
"the queues target group size(#~w) is not met and "
192+
"there are enough new nodes(#~w) in the cluster",
193+
[Node, rabbit_misc:rs(QName), TargetSize, length(New)]);
192194
{error, Err} ->
193-
rabbit_log:warning(
194-
"~ts: failed to add member (replica) on node ~w, error: ~w",
195-
[rabbit_misc:rs(QName), Node, Err])
195+
?LOG_WARNING(
196+
"~ts: failed to add member (replica) on node ~w, error: ~w",
197+
[rabbit_misc:rs(QName), Node, Err])
196198
end,
197199
ok;
198200
false ->
@@ -235,14 +237,14 @@ remove_members(Q, [Node | Nodes]) ->
235237
case rabbit_quorum_queue:delete_member(Q, Node) of
236238
ok ->
237239
QName = amqqueue:get_name(Q),
238-
rabbit_log:debug("~ts: Successfully removed member (replica) on node ~w",
239-
[rabbit_misc:rs(QName), Node]),
240+
?LOG_DEBUG("~ts: Successfully removed member (replica) on node ~w",
241+
[rabbit_misc:rs(QName), Node]),
240242
ok;
241243
{error, Err} ->
242244
QName = amqqueue:get_name(Q),
243-
rabbit_log:warning("~ts: failed to remove member (replica) on node "
244-
"~w, error: ~w",
245-
[rabbit_misc:rs(QName), Node, Err])
245+
?LOG_WARNING("~ts: failed to remove member (replica) on node "
246+
"~w, error: ~w",
247+
[rabbit_misc:rs(QName), Node, Err])
246248
end,
247249
remove_members(Q, Nodes).
248250

‎deps/rabbitmq_federation/src/rabbit_federation_app.erl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
-module(rabbit_federation_app).
99

10+
-include_lib("rabbitmq_federation/include/logging.hrl").
11+
1012
-behaviour(application).
1113
-export([start/2, stop/1]).
1214

‎deps/rabbitmq_federation/src/rabbit_federation_exchange_link.erl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
-include_lib("amqp_client/include/amqp_client.hrl").
1111
-include("rabbit_federation.hrl").
1212
-include_lib("kernel/include/logger.hrl").
13+
-include_lib("rabbitmq_federation/include/logging.hrl").
1314

1415
-behaviour(gen_server2).
1516

‎deps/rabbitmq_federation/src/rabbit_federation_exchange_link_sup_sup.erl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
-include_lib("rabbit_common/include/rabbit.hrl").
1313
-include_lib("kernel/include/logger.hrl").
14+
-include_lib("rabbitmq_federation/include/logging.hrl").
1415
-define(SUPERVISOR, ?MODULE).
1516

1617
%% Supervises the upstream links for all exchanges (but not queues). We need

‎deps/rabbitmq_federation/src/rabbit_federation_pg.erl‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,18 @@
88
-module(rabbit_federation_pg).
99

1010
-include("rabbit_federation.hrl").
11+
-include_lib("kernel/include/logger.hrl").
1112

1213
-export([start_scope/0, stop_scope/0]).
1314

1415
start_scope() ->
15-
rabbit_log_federation:debug("Starting pg scope ~ts", [?FEDERATION_PG_SCOPE]),
16+
?LOG_DEBUG("Starting pg scope ~ts", [?FEDERATION_PG_SCOPE]),
1617
_ = pg:start_link(?FEDERATION_PG_SCOPE).
1718

1819
stop_scope() ->
1920
case whereis(?FEDERATION_PG_SCOPE) of
2021
Pid when is_pid(Pid) ->
21-
rabbit_log_federation:debug("Stopping pg scope ~ts", [?FEDERATION_PG_SCOPE]),
22+
?LOG_DEBUG("Stopping pg scope ~ts", [?FEDERATION_PG_SCOPE]),
2223
exit(Pid, normal);
2324
_ ->
2425
ok

‎deps/rabbitmq_federation/src/rabbit_federation_queue_link.erl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
-include_lib("amqp_client/include/amqp_client.hrl").
1212
-include("rabbit_federation.hrl").
1313
-include_lib("kernel/include/logger.hrl").
14+
-include_lib("rabbitmq_federation/include/logging.hrl").
1415

1516
-behaviour(gen_server2).
1617

‎deps/rabbitmq_shovel_management/src/rabbit_shovel_mgmt_shovel.erl‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,8 @@ try_delete(Node, VHost, Name, Username) ->
178178
{error, not_found} ->
179179
?LOG_ERROR("Could not find shovel data for shovel '~s' in vhost: '~s'", [Name, VHost]),
180180
false
181-
<<<<<<< HEAD
182181
catch _:Reason ->
183182
?LOG_ERROR("Failed to delete shovel '~s' on vhost '~s', reason: ~p",
184-
[Name, VHost, Reason]),
183+
[Name, VHost, Reason]),
185184
false
186185
end.

0 commit comments

Comments
 (0)