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

Merge pull request #443 from KushalP/email-idiomatic-variable-assignment

Browse source 
Refactor LogStash::Outputs::Email.register method
This commit is contained in:
Jordan Sissel 2013-04-16 15:00:34 -07:00
commit 2a581181e6
1 changed files with 10 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

66
lib/logstash/outputs/email.rb
View file

@ -94,63 +94,17 @@ class LogStash::Outputs::Email < LogStash::Outputs::Base
def register
require "mail"
if @via == "smtp"
debug = @options.include?("debug")
if !debug
debug = false
else
debug = @options.fetch("debug")
end
smtpIporHost = @options.include?("smtpIporHost")
if !smtpIporHost
smtpIporHost = "localhost"
else
smtpIporHost = @options.fetch("smtpIporHost")
end
domain = @options.include?("domain")
if !domain
domain = "localhost"
else
domain = @options.fetch("domain")
end
port = @options.include?("port")
if !port
port = 25
else
port = @options.fetch("port")
end
tls = @options.include?("starttls")
if !tls
tls = false
else
tls = @options.fetch("starttls")
end
pass = @options.include?("password")
if !pass
pass = nil
else
pass = @options.fetch("password")
end
userName = @options.include?("userName")
if !userName
userName = nil
else
userName = @options.fetch("userName")
end
authenticationType = @options.include?("authenticationType")
if !authenticationType
authenticationType = nil
else
authenticationType = @options.fetch("authenticationType")
end
Mail.defaults do
delivery_method :smtp , { :address => smtpIporHost,
:port => port,
:domain => domain,
:user_name => userName,
:password => pass,
:authentication => authenticationType,
:enable_starttls_auto => tls,
:debug => debug }
delivery_method :smtp, {
:address => @options.fetch("smtpIporHost", "localhost"),
:port => @options.fetch("port", 25),
:domain => @options.fetch("domain", "localhost"),
:user_name => @options.fetch("userName", nil),
:password => @options.fetch("password", nil),
:authentication => @options.fetch("authenticationType", nil),
:enable_starttls_auto => @options.fetch("starttls", false),
:debug => @options.fetch("debug", false)
}
end
elsif @via == 'sendmail'
Mail.defaults do