From c24756e505a64eeeee8fd8bb21fb5ab9e964a8bd Mon Sep 17 00:00:00 2001 From: Marcial Rosales Date: Tue, 23 Jul 2024 18:19:40 +0200 Subject: [PATCH] Static shovels remain as they are --- deps/rabbitmq_shovel/app.bzl | 1 + deps/rabbitmq_shovel/src/rabbit_amqp091_shovel.erl | 10 +++------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/deps/rabbitmq_shovel/app.bzl b/deps/rabbitmq_shovel/app.bzl index 3ce4131b6f..509242770a 100644 --- a/deps/rabbitmq_shovel/app.bzl +++ b/deps/rabbitmq_shovel/app.bzl @@ -110,6 +110,7 @@ def all_srcs(name = "all_srcs"): filegroup( name = "priv", + srcs = ["priv/schema/rabbitmq_shovel.schema"], ) filegroup( diff --git a/deps/rabbitmq_shovel/src/rabbit_amqp091_shovel.erl b/deps/rabbitmq_shovel/src/rabbit_amqp091_shovel.erl index cd70c55fa4..f8243d972a 100644 --- a/deps/rabbitmq_shovel/src/rabbit_amqp091_shovel.erl +++ b/deps/rabbitmq_shovel/src/rabbit_amqp091_shovel.erl @@ -7,6 +7,8 @@ -module(rabbit_amqp091_shovel). +-define(APP, rabbitmq_shovel). + -behaviour(rabbit_shovel_behaviour). -include_lib("amqp_client/include/amqp_client.hrl"). @@ -45,7 +47,6 @@ -define(MAX_CONNECTION_CLOSE_TIMEOUT, 10000). parse(_Name, {source, Source}) -> - rabbit_log:debug("shove-091-parse ~p", [Source]), Prefetch = parse_parameter(prefetch_count, fun parse_non_negative_integer/1, proplists:get_value(prefetch_count, Source, ?DEFAULT_PREFETCH)), @@ -53,14 +54,9 @@ parse(_Name, {source, Source}) -> proplists:get_value(queue, Source)), %% TODO parse CArgs = proplists:get_value(consumer_args, Source, []), - DeclFun = case proplists:get_value(predeclared, Source, false) of - true -> check_fun(Source); - false -> decl_fun(Source) - end, - rabbit_log:debug("shovel-parse-source ~p", [Source]), #{module => ?MODULE, uris => proplists:get_value(uris, Source), - resource_decl => DeclFun, + resource_decl => decl_fun(Source), queue => Queue, delete_after => proplists:get_value(delete_after, Source, never), prefetch_count => Prefetch,