Merge pull request #14434 from rabbitmq/mk-extract-dyn-shovel-supervisor

Shovel status: minor refactoring

Author: michaelklishin

deps/rabbitmq_shovel/src/rabbit_shovel_status.erl

@@ -8,6 +8,10 @@
 -module(rabbit_shovel_status).
 -behaviour(gen_server).
 
+-import(rabbit_shovel_util, [
+    dynamic_shovel_supervisor_mod/0
+]).
+
 -export([start_link/0]).
 
 -export([report/3,
@@ -186,7 +190,8 @@ handle_cast({remove, Name}, State) ->
 
 handle_info(check, State) ->
     try
-        rabbit_shovel_dyn_worker_sup_sup:cleanup_specs()
+        Mod = dynamic_shovel_supervisor_mod(),
+        Mod:cleanup_specs()
     catch
         C:E ->
             ?LOG_WARNING("Recurring shovel spec clean up failed with ~p:~p", [C, E])

deps/rabbitmq_shovel/src/rabbit_shovel_util.erl

@@ -15,6 +15,10 @@
          gen_unique_name/2,
          decl_fun/2]).
 
+-export([
+    dynamic_shovel_supervisor_mod/0
+]).
+
 -include_lib("rabbit_common/include/rabbit_framing.hrl").
 -include_lib("rabbit_common/include/rabbit.hrl").
 -include_lib("kernel/include/logger.hrl").
@@ -23,6 +27,10 @@
 -define(ROUTING_HEADER, <<"x-shovelled">>).
 -define(TIMESTAMP_HEADER, <<"x-shovelled-timestamp">>).
 
+-spec dynamic_shovel_supervisor_mod() -> module().
+dynamic_shovel_supervisor_mod() ->
+    rabbit_shovel_dyn_worker_sup_sup.
+
 update_headers(Prefix, Suffix, SrcURI, DestURI,
                Props = #'P_basic'{headers = Headers}) ->
     Table = Prefix ++ [{<<"src-uri">>,  SrcURI},
@@ -92,9 +100,10 @@ restart_shovel(VHost, Name) ->
         not_found ->
             {error, not_found};
         _Obj ->
+            Mod = dynamic_shovel_supervisor_mod(),
             ?LOG_INFO("Shovel '~ts' in virtual host '~ts' will be restarted", [Name, VHost]),
-            ok = rabbit_shovel_dyn_worker_sup_sup:stop_child({VHost, Name}),
-            {ok, _} = rabbit_shovel_dyn_worker_sup_sup:start_link(),
+            ok = Mod:stop_child({VHost, Name}),
+            {ok, _} = Mod:start_link(),
             ok
     end.