Adapt logging changes in #4468 to Lager on Erlang 24+

Author: michaelklishin

deps/rabbit/src/rabbit_maintenance.erl

@@ -270,27 +270,15 @@ transfer_leadership_of_classic_mirrored_queues(TransferCandidates) ->
                           [rabbit_misc:rs(Name), readable_candidate_list(ExistingReplicaNodes)]),
          case random_primary_replica_transfer_candidate_node(TransferCandidates, ExistingReplicaNodes) of
              {ok, Pick} ->
-<<<<<<< HEAD
-                 _ = rabbit_log:debug("Will transfer leadership of local ~s to node ~s",
-                          [rabbit_misc:rs(Name), Pick]),
-                 case rabbit_mirror_queue_misc:migrate_leadership_to_existing_replica(Q, Pick) of
-                     {migrated, _} ->
-                         _ = rabbit_log:debug("Successfully transferred leadership of queue ~s to node ~s",
-                                          [rabbit_misc:rs(Name), Pick]);
-                     Other ->
-                         _ = rabbit_log:warning("Could not transfer leadership of queue ~s to node ~s: ~p",
-                                            [rabbit_misc:rs(Name), Pick, Other])
-=======
-                 rabbit_log:debug("Will transfer leadership of local ~s. Planned target node: ~s",
-                          [rabbit_misc:rs(Name), Pick]),
+                 _ = rabbit_log:debug("Will transfer leadership of local ~s. Planned target node: ~s",
+                                     [rabbit_misc:rs(Name), Pick]),
                  case rabbit_mirror_queue_misc:migrate_leadership_to_existing_replica(Q, Pick) of
                      {migrated, NewPrimary} ->
-                         rabbit_log:debug("Successfully transferred leadership of queue ~s to node ~s",
-                                          [rabbit_misc:rs(Name), NewPrimary]);
+                         _ = rabbit_log:debug("Successfully transferred leadership of queue ~s to node ~s",
+                                             [rabbit_misc:rs(Name), NewPrimary]);
                      Other ->
-                         rabbit_log:warning("Could not transfer leadership of queue ~s: ~p",
-                                            [rabbit_misc:rs(Name), Other])
->>>>>>> 5f71db9197 (Fix migrate leadership timeout)
+                         _ = rabbit_log:warning("Could not transfer leadership of queue ~s: ~p",
+                                               [rabbit_misc:rs(Name), Other])
                  end;
              undefined ->
                  _ = rabbit_log:warning("Could not transfer leadership of queue ~s: no suitable candidates?",