fluent-plugin-slack 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODA4MDM5NWYzOGM1MzhlYWRkMmUzZWI2Mjg4ODkzNDFiYjRkN2RhOQ==
+    YzAwOGJlODQ1MzNhY2U5ZWZlYjg5YzdiYTQzZTdlNDA3NzRmNWQ0OQ==
   data.tar.gz: !binary |-
-    MjYxOTZhMDQxY2VmODhhNDQyMGE1N2ZjODZlOTI1YjkwNTExYzVhMA==
+    MmNhMzBjM2Y5YThhMWU0YWY1NmVmNDQ0NTA5YjMxNGQzZTcyNDk4OA==
 SHA512:
   metadata.gz: !binary |-
-    NzA0N2JiMGRjZmVjYWRmYmM2ZTM0ZDQ1OWM1YTNiYTJkNTQxZjhhNTc1ZDRj
-    YTJjZWUwY2RkZTc2Y2U3NGZlZTJlNTliN2RlMGM2OGI1NWNhZmNmMWE4OWIy
-    NTFjMzkxMmU1NjAxMWRlN2EyMjlhYTZlODM1NGNkYjA0OWU0Mjc=
+    YTUxZmExNjYwOGRhNTY1N2I2NWNjNjc4NTgzZjA2NTFkZTNhM2I4Yzg0NjFh
+    YThhZjE1MmZhOWRjNDFiYzhhZjIxMzRjNjUzNDAwZGM5YWQxOWRhZjJmMGNj
+    YjFlMDJhNzY3MjdhZWUxOWJhM2VhODk2NTgzYjI5ZWQ2NTExMjU=
   data.tar.gz: !binary |-
-    MTAzMDk3NWY3NTMzZWIyZGVlNTAwZjYzMmEzM2QzNTE5ZDgwOWI1MjQyODRi
-    ZWMzNTQwMTc0N2FiZDc5YTRhMjc4OGJhMGMyOTg3MmMzNWM2OGI2MDExM2Qz
-    MTA0YWU2NGU5MWVkZjg0ZTgyNzE5ZTM2MjNkZGJkYmViMTAyMTc=
+    ZjhjODFiMDdkYjBjZTI2YmM5ZDdhYWEwMzBhNzg1ZDEyMmZjYjgwMzlkY2Jj
+    ZmUyZWFkYTU0YWU1ZDVhYzRlNjc2OTU5MGUyNjNhZDJiNThmYWE1YmM2ZWMz
+    M2Q1ZDA2OGM1ODg2YWQ1MDliMzhmZDAxYWUxMDNhZDYyOGNjN2Q=

data/README.rdoc

@@ -9,7 +9,7 @@
     <match slack>
       type buffered_slack
       api_key XXX
-      channel my_room
+      channel %23general # You should use %23 in return for #
       username sowasowa
       color good
       icon_emoji :ghost:

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/fluent-plugin-slack.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "fluentd", ">= 0.10.8"
   gem.add_dependency "slackr",  ">= 0.0.2"
+  gem.add_dependency "activesupport", ">=3.2.16"
+  gem.add_dependency "tzinfo", ">=0.3.38"
 
   gem.add_development_dependency "rake", ">= 0.9.2"
   gem.add_development_dependency "simplecov", ">= 0.5.4"

data/lib/fluent/plugin/out_buffered_slack.rb

@@ -7,6 +7,7 @@ module Fluent
     config_param :username,   :string
     config_param :color,      :string
     config_param :icon_emoji, :string
+    config_param :timezone,   :string, default: nil
 
     attr_reader :slack
 
@@ -18,40 +19,44 @@ module Fluent
       messages = {}
       chunk.msgpack_each do |tag, time, record|
         messages[tag] = '' if messages[tag].nil?
-        messages[tag] << "[#{Time.at(time)}] #{record['message']}\n"
+        messages[tag] << "[#{Time.at(time).in_time_zone(@timezone)}] #{record['message']}\n"
       end
       messages.each do |tag, value|
         field = {
           title: tag,
           value: value
         }
-        @slack.say(
-          nil,
-          { channel:     @channel,
-            username:    @username,
-            icon_emoji:  @icon_emoji,
-            attachments: [{
-              fallback: tag,
-              color:    @color,
-              fields:   [ field ]
-            }]})
+        begin
+          @slack.say(
+            nil,
+            { channel:     @channel,
+              username:    @username,
+              icon_emoji:  @icon_emoji,
+              attachments: [{
+                fallback: tag,
+                color:    @color,
+                fields:   [ field ]
+              }]})
+        rescue => e
+            $log.error("Slack Error: #{e.backtrace[0]} / #{e.message}")
+        end
       end
-    rescue => e
-      $log.error("Slack Error: #{e.backtrace[0]} / #{e.message}")
     end
 
     def initialize
       super
+      require 'active_support/time'
       require 'slackr'
     end
 
     def configure(conf)
       super
       @slack    = Slackr::Webhook.new(conf['team'], conf['api_key'])
-      @channel  = '#' + conf['channel']
+      @channel  = conf['channel']
       @username = conf['username'] || 'fluentd'
       @color    = conf['color'] || 'good'
       @icon_emoji = conf['icon_emoji'] || ':question:'
+      @timezone = conf['timezone'] || 'UTC'
     end
   end
 end

data/test/plugin/out_buffered_slack.rb

@@ -13,10 +13,11 @@ class BufferedSlackOutputTest < Test::Unit::TestCase
     type buffered_slack
     api_key testtoken
     team    sowasowa
-    channel  test
+    channel  %23test
     username testuser
     color    good
     icon_emoji :ghost:
+    timezone Asia/Tokyo
     compress gz
     buffer_path ./test/tmp
     utc
@@ -32,7 +33,7 @@ class BufferedSlackOutputTest < Test::Unit::TestCase
     d.tag = 'test'
     stub(d.instance.slack).say(
       nil,
-      channel:    '#test',
+      channel:    '%23test',
       username:   'testuser',
       icon_emoji: ':ghost:',
       attachments: [{
@@ -41,7 +42,7 @@ class BufferedSlackOutputTest < Test::Unit::TestCase
         fields:   [
           {
             title: d.tag,
-            value: "[#{Time.at(time)}] sowawa\n"
+            value: "[#{Time.at(time).in_time_zone('Tokyo')}] sowawa\n"
           }]}])
     d.emit({message: 'sowawa'}, time)
     d.expect_format %[#{['test', time, {message: 'sowawa'}].to_msgpack}]
@@ -54,7 +55,7 @@ class BufferedSlackOutputTest < Test::Unit::TestCase
     d.tag  = 'test'
     stub(d.instance.slack).say(
       nil,
-      channel:    '#test',
+      channel:    '%23test',
       username:   'testuser',
       icon_emoji: ':ghost:',
       attachments: [{
@@ -63,8 +64,8 @@ class BufferedSlackOutputTest < Test::Unit::TestCase
         fields:   [
           {
             title: d.tag,
-            value: "[#{Time.at(time)}] sowawa1\n" +
-                     "[#{Time.at(time)}] sowawa2\n"
+            value: "[#{Time.at(time).in_time_zone('Tokyo')}] sowawa1\n" +
+                     "[#{Time.at(time).in_time_zone('Tokyo')}] sowawa2\n"
           }]}])
     d.emit({message: 'sowawa1'}, time)
     d.emit({message: 'sowawa2'}, time)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-slack
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Keisuke SOGAWA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -38,6 +38,34 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.16
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.16
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.38
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.38
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement