summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2021-01-07 23:54:27 +0300
committerMichael Klishin <michael@clojurewerkz.org>2021-01-07 23:54:27 +0300
commit6da594cd3f9e4c842babcdcca72a2d4387945d04 (patch)
treeae2f2a876ae4863b3be622e03f0ef5b76035f5b4
parent78b57822b4997e66ca08018e4678b8f6375281d2 (diff)
downloadrabbitmq-server-git-6da594cd3f9e4c842babcdcca72a2d4387945d04.tar.gz
Dynamic Shovels: avoid log spam
when an autodelete Shovel terminates is attempted to be restarted by a mirrored supervisor on another node. Per discussion with @lukebakken.
-rw-r--r--deps/rabbitmq_shovel/src/rabbit_shovel_worker.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/deps/rabbitmq_shovel/src/rabbit_shovel_worker.erl b/deps/rabbitmq_shovel/src/rabbit_shovel_worker.erl
index a95364696e..29a1ad0f84 100644
--- a/deps/rabbitmq_shovel/src/rabbit_shovel_worker.erl
+++ b/deps/rabbitmq_shovel/src/rabbit_shovel_worker.erl
@@ -31,11 +31,13 @@ start_link(Type, Name, Config) ->
maybe_start_link(ShovelParameter, Type, Name, Config).
maybe_start_link(not_found, dynamic, _Name, _Config) ->
- %% rabbitmq/rabbitmq-server#2655
+ %% See rabbitmq/rabbitmq-server#2655.
%% All dynamic shovels require that their associated parameter is present.
%% If not, this shovel has been deleted and stale child spec information
%% may still reside in the supervisor.
- {error, not_found};
+ %%
+ %% We return 'ignore' to ensure that the child is not [re-]added in such case.
+ ignore;
maybe_start_link(_, Type, Name, Config) ->
ok = rabbit_shovel_status:report(Name, Type, starting),
gen_server2:start_link(?MODULE, [Type, Name, Config], []).