fluent-plugin-mail 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 08ceecd16cc939b91f13583cddc06d5c28a20b44
+  data.tar.gz: 7e0ad279c8f9496e142dc6a7e188a91882dce0d5
+SHA512:
+  metadata.gz: a551babe539ec1c50402f7493ef1f6b665f1746391ab7cf4e02d5927726dd0fc004dd37751b6bfd399598b071d2017864062e5f19bb3752a33b0e0cc8c580e98
+  data.tar.gz: aeb29d542110009b5649596a95cc04d209b613e896dab30a0c11cccae6802325c4a40ce7b3770b8cdf95ce84726e6958537f0f5f1452163abd62d64af6b06d39

data/README.md

@@ -82,6 +82,7 @@ Email is sent like
       password PASSWORD
       enable_starttls_auto true
       out_keys target_tag,pattern,value
+      time_locale UTC # optional
     </match>
 
 
@@ -126,7 +127,7 @@ configure td-agent.conf for single node
       from SOURCE_MAIL_ADDRESS
       to DESTINATION_MAIL_ADDRESS
       subject SUBJECT
-      outkeys target_tag, pattern, value, message_time
+      out_keys target_tag, pattern, value, message_time
     </match>
 
 
@@ -189,6 +190,7 @@ log server("/etc/td-agent/td-agent.conf")
       to DESTINATION_MAIL_ADDRESS
       subject SUBJECT
       outkeys target_tag, pattern, value
+      time_locale UTC # optional
     </match>
 
 

data/fluent-plugin-mail.gemspec

@@ -12,7 +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.2'
+  gem.version       = '0.0.3'
   gem.add_development_dependency "fluentd"
   gem.add_development_dependency "rake"
   gem.add_runtime_dependency "fluentd"

data/lib/fluent/plugin/out_mail.rb

@@ -14,9 +14,12 @@ class Fluent::MailOutput < Fluent::Output
   config_param :password, :string, :default => nil
   config_param :from, :string, :default => 'localhost@localdomain'
   config_param :to, :string, :default => ''
+  config_param :cc, :string, :default => ''
+  config_param :bcc, :string, :default => ''
   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 :time_locale, :default => nil
 
   def initialize
     super
@@ -161,10 +164,18 @@ class Fluent::MailOutput < Fluent::Output
     subject = subject.force_encoding('binary')
     body = msg.force_encoding('binary')
 
-    smtp.send_mail(<<EOS, @from, @to.split(/,/))
-Date: #{Time::now.strftime("%a, %d %b %Y %X")}
+    if time_local
+      date = Time::now.timezone(time_local)
+    else
+      date = Time::now
+    end
+
+    smtp.send_mail(<<EOS, @from, @to.split(/,/), @cc.split(/,/), @bcc.split(/,/))
+Date: #{date.strftime("%a, %d %b %Y %X %z")}
 From: #{@from}
 To: #{@to}
+Cc: #{@cc}
+Bcc: #{@bcc}
 Subject: #{subject}
 Mime-Version: 1.0
 Content-Type: text/plain; charset=utf-8
@@ -176,3 +187,15 @@ EOS
 
 end
 
+class Time
+  def timezone(timezone = 'UTC')
+    old = ENV['TZ']
+    utc = self.dup.utc
+    ENV['TZ'] = timezone
+    output = utc.localtime
+    ENV['TZ'] = old
+    output
+  end
+end
+
+

data/test/plugin/test_out_mail.rb

@@ -15,6 +15,20 @@ class MailOutputTest < Test::Unit::TestCase
     to localhost@localdomain
   ]
 
+  CONFIG_CC_BCC = %[
+    out_keys tag,time,value
+    time_key time
+    time_format %Y/%m/%d %H:%M:%S
+    tag_key tag
+    subject Fluentd Notification Alarm %s
+    subject_out_keys tag
+    host localhost
+    port 25
+    from localhost@localdomain
+    cc localhost@localdomain
+    bcc localhost@localdomain
+  ]
+
   CONFIG_MESSAGE = %[
     message out_mail: %s [%s]\\n%s
     message_out_keys tag,time,value
@@ -36,6 +50,8 @@ class MailOutputTest < Test::Unit::TestCase
   def test_configure
     d = create_driver(CONFIG_OUT_KEYS)
     assert_equal 'localhost', d.instance.host
+    d = create_driver(CONFIG_CC_BCC)
+    assert_equal 'localhost', d.instance.host
     d = create_driver(CONFIG_MESSAGE)
     assert_equal 'localhost', d.instance.host
   end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mail
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - Yuichi UEMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-10 00:00:00.000000000 Z
+date: 2013-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: output plugin for Mail
@@ -66,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -77,27 +70,26 @@ files:
 - test/plugin/test_out_mail.rb
 homepage: https://github.com/u-ichi/fluent-plugin-mail
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-mail
-rubygems_version: 1.8.23
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: output plugin for Mail
 test_files:
 - test/helper.rb