github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 06:37:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

- Wildcard routing keys aren't valid in direct exchanges, so if we want

Browse source 
all exchanges to work out of the box, the default routing key be the
  same on input and output. So fix that now.
This commit is contained in:
Jordan Sissel 2012-01-30 22:59:27 -08:00
parent 7b7762c948
commit b929cdfa78
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/logstash/inputs/amqp.rb
View file

@ -27,7 +27,7 @@ class LogStash::Inputs::Amqp < LogStash::Inputs::Base
config :password, :validate => :password, :default => "guest" config :password, :validate => :password, :default => "guest"
# The name of the queue. # The name of the queue.
config :name, :validate => :string, :default => '' config :name, :validate => :string, :default => ""
# The name of the exchange to bind the queue. This is analogous to the 'amqp # The name of the exchange to bind the queue. This is analogous to the 'amqp
# output' [config 'name'](../outputs/amqp) # output' [config 'name'](../outputs/amqp)
@ -35,7 +35,7 @@ class LogStash::Inputs::Amqp < LogStash::Inputs::Base
# The routing key to use. This is only valid for direct or fanout exchanges # The routing key to use. This is only valid for direct or fanout exchanges
# This setting is ignored on topic exchanges. # This setting is ignored on topic exchanges.
config :key, :validate => :string, :default => '#' config :key, :validate => :string, :default => "logstash"
# The vhost to use. If you don't know what this is, leave the default. # The vhost to use. If you don't know what this is, leave the default.
config :vhost, :validate => :string, :default => "/" config :vhost, :validate => :string, :default => "/"
@ -96,7 +96,7 @@ class LogStash::Inputs::Amqp < LogStash::Inputs::Base
@amqpsettings[:ssl] = @ssl if @ssl @amqpsettings[:ssl] = @ssl if @ssl
@amqpsettings[:verify_ssl] = @verify_ssl if @verify_ssl @amqpsettings[:verify_ssl] = @verify_ssl if @verify_ssl
@amqpurl = "amqp://" @amqpurl = "amqp://"
amqp_credentials = '' amqp_credentials = ""
amqp_credentials << @user if @user amqp_credentials << @user if @user
amqp_credentials << ":#{@password}" if @password amqp_credentials << ":#{@password}" if @password
@amqpurl += amqp_credentials unless amqp_credentials.nil? @amqpurl += amqp_credentials unless amqp_credentials.nil?