From 4285cd9c2697053c298e0cf8e770930b22604705 Mon Sep 17 00:00:00 2001 From: Roeland Molenaar Date: Tue, 16 Jul 2013 18:19:51 +0200 Subject: [PATCH 1/3] add user so it doesn't always use the default --- lib/logstash/inputs/rabbitmq/hot_bunnies.rb | 3 ++- lib/logstash/outputs/rabbitmq/hot_bunnies.rb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/logstash/inputs/rabbitmq/hot_bunnies.rb b/lib/logstash/inputs/rabbitmq/hot_bunnies.rb index 132754fe672..e6174c49928 100644 --- a/lib/logstash/inputs/rabbitmq/hot_bunnies.rb +++ b/lib/logstash/inputs/rabbitmq/hot_bunnies.rb @@ -13,7 +13,8 @@ def register @settings = { :vhost => @vhost, :host => @host, - :port => @port + :port => @port, + :user => @user } @settings[:pass] = @password.value if @password @settings[:tls] = @ssl if @ssl diff --git a/lib/logstash/outputs/rabbitmq/hot_bunnies.rb b/lib/logstash/outputs/rabbitmq/hot_bunnies.rb index 8e0962eef3e..d48083581d3 100644 --- a/lib/logstash/outputs/rabbitmq/hot_bunnies.rb +++ b/lib/logstash/outputs/rabbitmq/hot_bunnies.rb @@ -87,7 +87,8 @@ def connect @settings = { :vhost => @vhost, :host => @host, - :port => @port + :port => @port, + :user => @user } @settings[:pass] = if @password @password.value From bdb4c149a049267becd2ddd7b61ed392e2db4511 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Wed, 17 Jul 2013 10:58:14 +0400 Subject: [PATCH 2/3] [rabbitmq] Use Bunny 0.9.1+ Nothing major in `0.9.1` but I'd like Logstash to keep up with recent releases. --- logstash.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logstash.gemspec b/logstash.gemspec index 885773ac28b..e006e783268 100644 --- a/logstash.gemspec +++ b/logstash.gemspec @@ -88,7 +88,7 @@ Gem::Specification.new do |gem| end if RUBY_PLATFORM != 'java' - gem.add_runtime_dependency "bunny", ["~> 0.9.0.rc2"] #(MIT license) + gem.add_runtime_dependency "bunny", ["~> 0.9.1"] #(MIT license) else gem.add_runtime_dependency "hot_bunnies", ["~> 2.0.0.pre8"] #(MIT license) end From b2c78ca61b5aea2c7f462845ba3d03a8f3209b69 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Wed, 17 Jul 2013 10:59:29 +0400 Subject: [PATCH 3/3] [rabbitmq] Use HotBunnies 2.0.0.pre9+ --- logstash.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logstash.gemspec b/logstash.gemspec index 885773ac28b..dd440cfdbc6 100644 --- a/logstash.gemspec +++ b/logstash.gemspec @@ -90,7 +90,7 @@ Gem::Specification.new do |gem| if RUBY_PLATFORM != 'java' gem.add_runtime_dependency "bunny", ["~> 0.9.0.rc2"] #(MIT license) else - gem.add_runtime_dependency "hot_bunnies", ["~> 2.0.0.pre8"] #(MIT license) + gem.add_runtime_dependency "hot_bunnies", ["~> 2.0.0.pre9"] #(MIT license) end if RUBY_VERSION >= '1.9.1'