Merge remote-tracking branch 'logstashmaster/master'

This commit is contained in:
Nick Ethier 2011-08-02 15:14:21 -06:00
commit c1dcf5049f
2 changed files with 16 additions and 0 deletions

View file

@ -41,6 +41,12 @@ class LogStash::Inputs::Amqp < LogStash::Inputs::Base
# Enable or disable debugging
config :debug, :validate => :boolean, :default => false
# Enable or disable SSL
config :ssl, :validate => :boolean, :default => false
# Validate SSL certificate
config :verify_ssl, :validate => :boolean, :default => false
public
def initialize(params)
super
@ -66,6 +72,8 @@ class LogStash::Inputs::Amqp < LogStash::Inputs::Base
@amqpsettings[:user] = @user if @user
@amqpsettings[:pass] = @password.value if @password
@amqpsettings[:logging] = @debug
@amqpsettings[:ssl] = @ssl if @ssl
@amqpsettings[:verify_ssl] = @verify_ssl if @verify_ssl
@amqpurl = "amqp://"
if @user or @password
@amqpurl += "#{@user}:xxxxxx@"

View file

@ -45,6 +45,12 @@ class LogStash::Outputs::Amqp < LogStash::Outputs::Base
# Enable or disable debugging
config :debug, :validate => :boolean, :default => false
# Enable or disable SSL
config :ssl, :validate => :boolean, :default => false
# Validate SSL certificate
config :verify_ssl, :validate => :boolean, :default => false
public
def register
require "bunny" # rubygem 'bunny'
@ -66,6 +72,8 @@ class LogStash::Outputs::Amqp < LogStash::Outputs::Base
}
amqpsettings[:user] = @user if @user
amqpsettings[:pass] = @password.value if @password
amqpsettings[:ssl] = @ssl if @ssl
amqpsettings[:verify_ssl] = @verify_ssl if @verify_ssl
begin
@logger.debug(["Connecting to AMQP", amqpsettings, @exchange_type, @name])