Address review feedback #14425

Author: michaelklishin

deps/rabbitmq_shovel/src/rabbit_shovel_dyn_worker_sup_sup.erl

@@ -26,13 +26,13 @@ start_link() ->
             {ok, Pid0}                       -> Pid0;
             {error, {already_started, Pid0}} -> Pid0
           end,
-    IsStandard = rabbit_shovel_operating_mode:is_standard(),
-    Shovels = case IsStandard of
-        false ->
+    OpMode = rabbit_shovel_operating_mode:operating_mode(),
+    Shovels = case OpMode of
+        standard ->
+            rabbit_runtime_parameters:list_component(<<"shovel">>);
+        _Other ->
             %% when operating in a non-standard mode, do not start any shovels
-            [];
-        true ->
-            rabbit_runtime_parameters:list_component(<<"shovel">>)
+            []
     end,
     [start_child({pget(vhost, Shovel), pget(name, Shovel)},
                  pget(value, Shovel)) || Shovel <- Shovels],

deps/rabbitmq_shovel/src/rabbit_shovel_operating_mode.erl

@@ -10,9 +10,7 @@
 -include("rabbit_shovel.hrl").
 
 -export([
-  operating_mode/0,
-  is_standard/0,
-  is_alternative/0
+  operating_mode/0
 ]).
 
 -type operating_mode() :: 'standard' | atom().
@@ -24,11 +22,3 @@
 -spec operating_mode() -> operating_mode().
 operating_mode() ->
     application:get_env(?SHOVEL_APP, operating_mode, standard).
-
--spec is_standard() -> boolean().
-is_standard() ->
-    operating_mode() =:= standard.
-
--spec is_alternative() -> boolean().
-is_alternative() ->
-    operating_mode() =/= standard.

deps/rabbitmq_shovel/src/rabbit_shovel_parameters.erl

@@ -39,19 +39,21 @@
                     {enables, recovery}]}).
 
 register() ->
-    case rabbit_shovel_operating_mode:is_standard() of
-        true ->
+    OpMode = rabbit_shovel_operating_mode:operating_mode(),
+    case OpMode of
+        standard ->
             rabbit_registry:register(runtime_parameter, <<"shovel">>, ?MODULE);
-        false ->
-            ?LOG_DEBUG("Shovel: skipping runtime parameter registration, operating mode: ~ts", [rabbit_shovel_operating_mode:operating_mode()])
+        _Other ->
+            ?LOG_DEBUG("Shovel: skipping runtime parameter registration, operating mode: ~ts", [OpMode])
     end.
 
 unregister() ->
-    case rabbit_shovel_operating_mode:is_standard() of
-        true ->
+    OpMode = rabbit_shovel_operating_mode:operating_mode(),
+    case OpMode of
+        standard ->
             rabbit_registry:unregister(runtime_parameter, <<"shovel">>);
-        false ->
-            ?LOG_DEBUG("Shovel: skipping runtime parameter deregistration, operating mode: ~ts", [rabbit_shovel_operating_mode:operating_mode()])
+        _Other ->
+            ?LOG_DEBUG("Shovel: skipping runtime parameter deregistration, operating mode: ~ts", [OpMode])
     end.
 
 validate(_VHost, <<"shovel">>, Name, Def0, User) ->
@@ -75,19 +77,21 @@ pget2(K1, K2, Defs) -> case {pget(K1, Defs), pget(K2, Defs)} of
                        end.
 
 notify(VHost, <<"shovel">>, Name, Definition, _Username) ->
-    case rabbit_shovel_operating_mode:is_standard() of
-        true ->
+    OpMode = rabbit_shovel_operating_mode:operating_mode(),
+    case OpMode of
+        standard ->
             rabbit_shovel_dyn_worker_sup_sup:adjust({VHost, Name}, Definition);
-        false ->
-            ?LOG_DEBUG("Shovel: ignoring a runtime parameter update, operating mode: ~ts", [rabbit_shovel_operating_mode:operating_mode()])
+        _Other ->
+            ?LOG_DEBUG("Shovel: ignoring a runtime parameter update, operating mode: ~ts", [OpMode])
     end.
 
 notify_clear(VHost, <<"shovel">>, Name, _Username) ->
-    case rabbit_shovel_operating_mode:is_standard() of
-        true ->
+    OpMode = rabbit_shovel_operating_mode:operating_mode(),
+    case OpMode of
+        standard ->
             rabbit_shovel_dyn_worker_sup_sup:stop_child({VHost, Name});
-        false ->
-            ?LOG_DEBUG("Shovel: ignoring a cleared runtime parameter, operating mode: ~ts", [rabbit_shovel_operating_mode:operating_mode()])
+        _Other ->
+            ?LOG_DEBUG("Shovel: ignoring a cleared runtime parameter, operating mode: ~ts", [OpMode])
     end.
 
 %%----------------------------------------------------------------------------

deps/rabbitmq_shovel/src/rabbit_shovel_sup.erl

@@ -21,8 +21,8 @@ start_link() ->
     end.
 
 init([Configurations]) ->
-    IsStandard = rabbit_shovel_operating_mode:is_standard(),
-    StaticShovelSpecs = make_child_specs(IsStandard, Configurations),
+    OpMode = rabbit_shovel_operating_mode:operating_mode(),
+    StaticShovelSpecs = make_child_specs(OpMode, Configurations),
     Len = dict:size(Configurations),
     ChildSpecs = [
         #{
@@ -46,10 +46,8 @@ init([Configurations]) ->
     Opts = #{strategy => one_for_one, intensity => 2 * Len, period => 2},
     {ok, {Opts, ChildSpecs}}.
 
-make_child_specs(false = _StandardOperatingMode, _Configurations) ->
-    %% when operating in a non-standard mode, do not start any shovels
-    [];
-make_child_specs(true, Configurations) ->
+
+make_child_specs(standard, Configurations) ->
     dict:fold(
       fun (ShovelName, ShovelConfig, Acc) ->
             [
@@ -63,7 +61,10 @@ make_child_specs(true, Configurations) ->
                 }
                 | Acc
             ]
-        end, [], Configurations).
+        end, [], Configurations);
+make_child_specs(_NonStandardOpMode, _Configurations) ->
+    %% when operating in a non-standard mode, do not start any shovels
+    [].
 
 parse_configuration(undefined) ->
     {ok, dict:new()};