fluent-plugin-mail 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84dd64ebbce56d0161a06afdaad0f7b0b0e92ca8
-  data.tar.gz: 26fbf27b85376d6145fb9c8417f0f78799f24245
+  metadata.gz: 6f96ccf9d6555c9ecff2ea89418bd070994c9a4c
+  data.tar.gz: 48ae990d610d3e05766e1cc84ff621e355da9b5c
 SHA512:
-  metadata.gz: b6b1da613ef72f3a6ed6eb71c2848cc372263fded0a08a12cd9d2e221713b33195081e9a483471364bb37a91577b13983c2a7e72cac2eb917f369c22b079e8d2
-  data.tar.gz: 7b379e8fbce5ac4d77409f3a8e502bd62e8d03d944754f39ef4949f43f31dfd1c5ae210949ffa94964ae8ca79ed77c8fdec854f9be4a4b419cf4cc3fe5830035
+  metadata.gz: 5dd6e69c2161fc7dbb8f88baa6be0b1e877b09354ceec2d3fe24b5bcde35de582a830bf147445f7194698e1537ba6d37a333614fb90b1acd0c838e31c3c1352f
+  data.tar.gz: c7c9543c545bb28fe5c66417071cc27c6a244c2dfb1b6ccbeaf7fc29bdfe86bb785a8521ba152b7d065d5bf351f9a80ae2d60a0b3df9c09338843e960593a3ca

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+# 0.1.0
+
+Enhancement:
+
+* Add `enable_tls` option (thanks to @mash)
+* Add more debug messages (thanks to @glaci)
+
+# 0.0.5
+
+olders

data/README.md

@@ -70,7 +70,7 @@ Email is sent like
     #{target_tag} #{pattern}
     #{value}
 
-## Mail Configuration for Gmail(use TLS)
+## Mail Configuration for Gmail(use STARTTLS)
 
     <match **>
       type mail
@@ -83,6 +83,7 @@ Email is sent like
       user USERNAME( ex. hoge@gmail.com)
       password PASSWORD
       enable_starttls_auto true
+      enable_tls false
       out_keys target_tag,pattern,value
       time_locale UTC # optional
     </match>
@@ -201,10 +202,14 @@ log server("/etc/td-agent/td-agent.conf")
 
 * add config "mail_text_format"
 
+## ChangeLog
+
+See [CHANGELOG.md](CHANGELOG.md) for more details.
+
 ## Copyright
 
 * Copyright
   * Copyright (c) 2012- Yuichi UEMURA
+  * Copyright (c) 2014- Naotoshi Seo
   * License
     * Apache License, Version 2.0
-

data/fluent-plugin-mail.gemspec

@@ -1,8 +1,8 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Yuichi UEMURA"]
-  gem.email         = ["yuichi.u@gmail.com"]
+  gem.authors       = ["Yuichi UEMURA", "Naotoshi Seo"]
+  gem.email         = ["yuichi.u@gmail.com", "sonots@gmail.com"]
   gem.description   = %q{output plugin for Mail}
   gem.summary       = %q{output plugin for Mail}
   gem.homepage      = "https://github.com/u-ichi/fluent-plugin-mail"
@@ -12,9 +12,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "fluent-plugin-mail"
   gem.require_paths = ["lib"]
-  gem.version       = '0.0.5'
-  gem.add_development_dependency "fluentd"
+  gem.version       = '0.1.0'
   gem.add_development_dependency "rake"
   gem.add_runtime_dependency "fluentd"
 end
-

data/lib/fluent/plugin/out_mail.rb

@@ -24,6 +24,7 @@ class Fluent::MailOutput < Fluent::Output
   config_param :subject, :string, :default => 'Fluent::MailOutput plugin'
   config_param :subject_out_keys, :string, :default => ""
   config_param :enable_starttls_auto, :bool, :default => false
+  config_param :enable_tls, :bool, :default => false
   config_param :time_locale, :default => nil
 
   def initialize
@@ -92,8 +93,8 @@ class Fluent::MailOutput < Fluent::Output
       subject = subjects[i]
       begin
         res = sendmail(subject, msg)
-      rescue
-        log.warn "out_mail: failed to send notice to #{@host}:#{@port}, subject: #{subject}, message: #{msg}"
+      rescue => e
+        log.warn "out_mail: failed to send notice to #{@host}:#{@port}, subject: #{subject}, message: #{msg}, error_class: #{e.class}, error_message: #{e.message}, error_backtrace: #{e.backtrace.first}"
       end
     end
 
@@ -161,6 +162,7 @@ class Fluent::MailOutput < Fluent::Output
     if @user and @password
       smtp_auth_option = [@domain, @user, @password, :plain]
       smtp.enable_starttls if @enable_starttls_auto
+      smtp.enable_tls if @enable_tls
       smtp.start(@domain,@user,@password,:plain)
     else
       smtp.start
@@ -175,7 +177,7 @@ class Fluent::MailOutput < Fluent::Output
       date = Time::now
     end
 
-    smtp.send_mail(<<EOS, @from, @to.split(/,/), @cc.split(/,/), @bcc.split(/,/))
+    debug_msg = smtp.send_mail(<<EOS, @from, @to.split(/,/), @cc.split(/,/), @bcc.split(/,/))
 Date: #{date.strftime("%a, %d %b %Y %X %z")}
 From: #{@from}
 To: #{@to}
@@ -187,6 +189,7 @@ Content-Type: text/plain; charset=utf-8
 
 #{body}
 EOS
+    log.debug "out_mail: email send response: #{debug_msg}"
     smtp.finish
   end
 
@@ -202,5 +205,3 @@ class Time
     output
   end
 end
-
-

data/test/plugin/test_out_mail.rb

@@ -1,6 +1,9 @@
 require 'helper'
 
 class MailOutputTest < Test::Unit::TestCase
+  def setup
+    Fluent::Test.setup
+  end
 
   CONFIG_OUT_KEYS = %[
     out_keys tag,time,value

metadata

@@ -1,29 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mail
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Yuichi UEMURA
+- Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: fluentd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -55,11 +42,13 @@ dependencies:
 description: output plugin for Mail
 email:
 - yuichi.u@gmail.com
+- sonots@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -87,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-mail
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: output plugin for Mail