Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dont use shovel name as consumer tag #634

Merged
merged 5 commits into from
Feb 12, 2024
+30 −2
Merged

Dont use shovel name as consumer tag #634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e98875c
set a random consumer tag for shovels and let shovel names be long
viktorerlingsson Feb 8, 2024
00d6ad0
add spec for moving messages between queues with long names
viktorerlingsson Feb 8, 2024
fc680d2
fix spec
viktorerlingsson Feb 8, 2024
492ab80
format
viktorerlingsson Feb 8, 2024
8504516
use simply shovel as consumer tag for shovels
viktorerlingsson Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions spec/shovel_spec.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,34 @@ describe LavinMQ::Shovel do
Server.vhosts["/"].shovels.empty?.should be_true
end
end

it "should move messages between queues with long names" do
long_prefix = "a" * 250
source = LavinMQ::Shovel::AMQPSource.new(
"#{long_prefix}q1",
URI.parse(AMQP_BASE_URL),
"#{long_prefix}q1",
delete_after: LavinMQ::Shovel::DeleteAfter::QueueLength,
direct_user: Server.users.direct_user
)
dest = LavinMQ::Shovel::AMQPDestination.new(
"#{long_prefix}q2",
URI.parse(AMQP_BASE_URL),
"#{long_prefix}q2",
delete_after: LavinMQ::Shovel::DeleteAfter::QueueLength,
direct_user: Server.users.direct_user
)
shovel = LavinMQ::Shovel::Runner.new(source, dest, "ql_shovel", vhost)
with_channel do |ch|
q1, q2 = ShovelSpecHelpers.setup_qs ch, long_prefix
q1.publish_confirm "shovel me 1", "#{long_prefix}q1"
q1.publish_confirm "shovel me 2", "#{long_prefix}q1"
shovel.run
q2.get(no_ack: true).try(&.body_io.to_s).should eq "shovel me 1"
q2.get(no_ack: true).try(&.body_io.to_s).should eq "shovel me 2"
Server.vhosts["/"].shovels.empty?.should be_true
end
end
end

describe "HTTP" do
Expand Down
2 changes: 1 addition & 1 deletion src/lavinmq/shovel/shovel.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ module LavinMQ
@delete_after = DEFAULT_DELETE_AFTER, @prefetch = DEFAULT_PREFETCH,
@ack_mode = DEFAULT_ACK_MODE, consumer_args : Hash(String, JSON::Any)? = nil,
direct_user : User? = nil)
@tag = "Shovel[#{@name}]"
@tag = "Shovel"
cfg = Config.instance
@uri.host ||= "#{cfg.amqp_bind}:#{cfg.amqp_port}"
unless @uri.user
Expand Down
2 changes: 1 addition & 1 deletion static/js/queue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ document.querySelector('#moveMessages').addEventListener('submit', function (evt
const password = Auth.getPassword()
const uri = 'amqp://' + encodeURIComponent(username) + ':' + encodeURIComponent(password) + '@localhost/' + urlEncodedVhost
const dest = document.querySelector('[name=shovel-destination]').value.trim()
const name = ('Move ' + queue + ' to ' + dest).substring(0, 240) // max length of shovel name is 255
const name = 'Move ' + queue + ' to ' + dest
const url = 'api/parameters/shovel/' + urlEncodedVhost + '/' + encodeURIComponent(name)
const body = {
name,
Expand Down
Loading