Clean up

(cherry picked from commit ae17c6c)

Author: MarcialRosales

deps/rabbitmq_shovel/src/rabbit_amqp091_shovel.erl

@@ -630,10 +630,8 @@ decl_fun(Decl, _Conn, Ch) ->
      end || M <- lists:reverse(Decl)].
 
 check_fun(Queue, _Conn, Ch) ->
-    rabbit_log:debug("Checking if queue ~p exits", [Queue]),
     amqp_channel:call(Ch, #'queue.declare'{queue   = Queue,
-                                            passive = true}),
-    rabbit_log:debug("Queue ~p exits", [Queue]).
+                                            passive = true}).
 
 parse_parameter(Param, Fun, Value) ->
     try

deps/rabbitmq_shovel/src/rabbit_shovel_config.erl

@@ -66,13 +66,11 @@ convert_from_legacy(Config) ->
      {reconnect_delay, RD}].
 
 parse(ShovelName, Config0) ->
-    rabbit_log:debug("rabbit_shovel_config:parse ~p ~p", [ShovelName, Config0]),
     try
         validate(Config0),
         case is_legacy(Config0) of
             true ->            
                 Config = convert_from_legacy(Config0),
-                rabbit_log:debug("rabbit_shovel_config:parse is_legacy -> ~p", [Config]),
                 parse_current(ShovelName, Config);
             false ->
                 parse_current(ShovelName, Config0)
@@ -126,7 +124,6 @@ validate_uris0([Uri | Uris]) ->
 validate_uris0([]) -> ok.
 
 parse_current(ShovelName, Config) ->
-    rabbit_log:debug("rabbit_shovel_config:parse_current ~p", [ShovelName]),
     {source, Source} = proplists:lookup(source, Config),
     validate(Source),    
     SrcMod = resolve_module(proplists:get_value(protocol, Source, amqp091)),

deps/rabbitmq_shovel/src/rabbit_shovel_dyn_worker_sup.erl

@@ -52,7 +52,6 @@ init([Name, Config0]) ->
         %% reconnect-delay = 0 means "do not reconnect"
         _                                  -> temporary
     end,
-    rabbit_log:debug("rabbit_shovel_dyn_worker_sup Delay:~p Restart:~p", [Delay, Restart]),
     {ok, {{one_for_one, 1, ?MAX_WAIT},
           [{Name,
             {rabbit_shovel_worker, start_link, [dynamic, Name, Config]},

deps/rabbitmq_shovel/src/rabbit_shovel_parameters.erl

@@ -22,7 +22,8 @@
 %% from and can break with the next upgrade. It should not be used by
 %% another one that the one who created it or survive a node restart.
 %% Thus, function references have been replace by the following MFA.
--export([dest_decl/4, dest_check/4, src_decl_exchange/4, src_decl_queue/4,src_check_queue/4,
+-export([dest_decl/4, dest_check/4,
+         src_decl_exchange/4, src_decl_queue/4, src_check_queue/4,
          fields_fun/5, props_fun/9]).
 
 -import(rabbit_misc, [pget/2, pget/3, pset/3]).
@@ -360,7 +361,6 @@ parse_amqp091_dest({VHost, Name}, ClusterName, Def, SourceHeaders) ->
     AddTimestampHeaderLegacy = pget(<<"add-timestamp-header">>, Def, false),
     AddTimestampHeader = pget(<<"dest-add-timestamp-header">>, Def,
                               AddTimestampHeaderLegacy),
-    
     %% Details are only used for status report in rabbitmqctl, as vhost is not
     %% available to query the runtime parameters.
     Details = maps:from_list([{K, V} || {K, V} <- [{dest_exchange, DestX},
@@ -373,7 +373,7 @@ parse_amqp091_dest({VHost, Name}, ClusterName, Def, SourceHeaders) ->
                  fields_fun => {?MODULE, fields_fun, [X, Key]},
                  props_fun => {?MODULE, props_fun, [Table0, Table2, SetProps,
                                                     AddHeaders, SourceHeaders,
-                                                    AddTimestampHeader]}                          
+                                                    AddTimestampHeader]}
                 }, Details).
 
 fields_fun(X, Key, _SrcURI, _DestURI, P0) ->
@@ -455,15 +455,14 @@ parse_amqp091_source(Def) ->
     %% available to query the runtime parameters.
     Details = maps:from_list([{K, V} || {K, V} <- [{source_exchange, SrcX},
                                                    {source_exchange_key, SrcXKey}],
-                                        V =/= none]),
-    
+                                        V =/= none]),    
     {maps:merge(#{module => rabbit_amqp091_shovel,
                   uris => SrcURIs,
                   resource_decl => SrcDeclFun,
                   queue => Queue,
                   delete_after => opt_b2a(DeleteAfter),
                   prefetch_count => PrefetchCount,
-                  consumer_args => SrcCArgs                  
+                  consumer_args => SrcCArgs
                  }, Details), DestHeaders}.
 
 src_decl_exchange(SrcX, SrcXKey, _Conn, Ch) ->

deps/rabbitmq_shovel/src/rabbit_shovel_sup.erl

@@ -70,7 +70,6 @@ parse_configuration(_Defaults, [], Acc) ->
 parse_configuration(Defaults, [{ShovelName, ShovelConfig} | Env], Acc) when
     is_atom(ShovelName) andalso is_list(ShovelConfig)
 ->
-    rabbit_log:debug("rabbit_shovel:parse_configuration ~p ~p", [ShovelName, ShovelConfig]),
     case dict:is_key(ShovelName, Acc) of
         true ->
             {error, {duplicate_shovel_definition, ShovelName}};

deps/rabbitmq_shovel/src/rabbit_shovel_worker.erl

@@ -54,7 +54,6 @@ init([Type, Name, Config0]) ->
                                                                 Config0),
                     Conf
             end,
-    rabbit_log:debug("Shovel config : ~p", [Config]),
     rabbit_log_shovel:debug("Initialising a Shovel ~ts of type '~ts'", [human_readable_name(Name), Type]),
     gen_server2:cast(self(), init),
     {ok, #state{name = Name, type = Type, config = Config}}.

deps/rabbitmq_shovel/test/configuration_SUITE.erl

@@ -12,7 +12,7 @@
 
 -compile(export_all).
 
--define(QUEUE,    <<"test_queue">>).
+-define(QUEUE,       <<"test_queue">>).
 -define(EXCHANGE,    <<"test_exchange">>).
 -define(TO_SHOVEL,   <<"to_the_shovel">>).
 -define(FROM_SHOVEL, <<"from_the_shovel">>).
@@ -307,7 +307,7 @@ setup_legacy_shovels(Config) ->
 setup_shovels(Config) ->
     ok = rabbit_ct_broker_helpers:rpc(Config, 0,
       ?MODULE, setup_shovels1, [Config]).
-    
+
 setup_legacy_shovels1(Config) ->
     _ = application:stop(rabbitmq_shovel),
     Hostname = ?config(rmq_hostname, Config),

deps/rabbitmq_shovel/test/shovel_test_utils.erl

@@ -10,7 +10,8 @@
 -include_lib("common_test/include/ct.hrl").
 -export([set_param/3, set_param/4, set_param/5, set_param_nowait/3,
          await_shovel/2, await_shovel/3, await_shovel/4, await_shovel1/3,
-         shovels_from_status/0, shovels_from_status/1, get_shovel_status/2, get_shovel_status/3,
+         shovels_from_status/0, shovels_from_status/1, 
+         get_shovel_status/2, get_shovel_status/3,
          restart_shovel/2,
          await/1, await/2, clear_param/2, clear_param/3, make_uri/2]).
 
@@ -53,21 +54,17 @@ await_shovel(Config, Node, Name, ExpectedState) ->
       ?MODULE, await_shovel1, [Config, Name, ExpectedState]).
 
 await_shovel1(_Config, Name, ExpectedState) ->
-    rabbit_log:debug("await_shovel1 ~p on state ~p", [Name, ExpectedState]),
     Ret = await(fun() -> 
                   Status = shovels_from_status(ExpectedState),
-                  rabbit_log:debug("status=> ~p (~p)", [Status, ExpectedState]),  
                   lists:member(Name, Status)
           end, 30_000), 
-    rabbit_log:debug("await_shovel1 ~p on state ~p terminated", [Name, ExpectedState]),    
     Ret.
 
 shovels_from_status() ->    
     shovels_from_status(running).
 
 shovels_from_status(ExpectedState) ->
     S = rabbit_shovel_status:status(),
-    rabbit_log:debug("Shovel status of state ~p: all status: ~p", [ExpectedState, S]),
     [N || {{<<"/">>, N}, dynamic, {State, _}, _} <- S, State == ExpectedState].
 
 get_shovel_status(Config, Name) ->
@@ -94,7 +91,6 @@ await(Pred) ->
 await(_Pred, Timeout) when Timeout =< 0 ->
     error(await_timeout);
 await(Pred, Timeout) ->
-    rabbit_log:debug("await:Checking predicate . timeout=~p",[Timeout]),
     case Pred() of
         true  -> ok;
         Other when Timeout =< 100 ->