Merge pull request #455 from johnmshields/master

Updated to work when not using a proxy.
This commit is contained in:
Jordan Sissel 2013-04-22 13:35:25 -07:00
commit 1b7cce8e03

View file

@ -55,7 +55,7 @@ class LogStash::Outputs::Loggly < LogStash::Outputs::Base
config :proxy_user, :validate => :string
# Proxy Password
config :proxy_password, :validate => :password
config :proxy_password, :validate => :password, :default => ""
public
@ -75,7 +75,7 @@ class LogStash::Outputs::Loggly < LogStash::Outputs::Base
# Send the event over http.
url = URI.parse("#{@proto}://#{@host}/inputs/#{event.sprintf(@key)}")
@logger.info("Loggly URL", :url => url)
http = Net::HTTP::Proxy(@proxy_host, @proxy_port, @proxy_user, @proxy_password.value).new(uri.host, uri.port)
http = Net::HTTP::Proxy(@proxy_host, @proxy_port, @proxy_user, @proxy_password.value).new(url.host, url.port)
if url.scheme == 'https'
http.use_ssl = true
http.verify_mode = OpenSSL::SSL::VERIFY_NONE