fluent-plugin-ikachan 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a09a8584710467518dad39709493aace437a4ae6
-  data.tar.gz: caf0f713f67cf2906fdee62914231f01bb2634c3
+  metadata.gz: 4b168b15153134a57ec8833e18f539a2439a78c8
+  data.tar.gz: d8c2a5123dea47b1147f78fa85600aae3ad124a4
 SHA512:
-  metadata.gz: 3c428dc2a3ac80150bde9f999e8e68cab51a6ac08b6a85afed266bda1cc5c85ceb67ffbfc7ef78100a4319fd1aa7886f05880ca7af72c7816dc0bf435fa9a2ae
-  data.tar.gz: 007ab53621a09165983f0d4c0eb8dca0d541172d6c1df0e9e4431953fc11606bad74778236653444dcb01622c43c6fdd7ef491e5692202a60e5e02b98caf92a7
+  metadata.gz: 253bb4d83c204016719c8cab24dfacaba02438c1eb50ddefeea830a5e769e3bb2b4d4e6135072f5de68db1066f34909977eeaf2c679042f9d3e20e5d031b82ac
+  data.tar.gz: 3b8b0b516cf96f5fe6768ff12fc28b405442751db462324ed0090e38f9829ca49ed0fc4abc42dad076031e750364a9775cf27a5e543f2b4d3f72c68f33769376

data/fluent-plugin-ikachan.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-ikachan"
-  gem.version       = "0.2.4"
+  gem.version       = "0.2.5"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.summary       = %q{output plugin for IRC-HTTP gateway 'ikachan'}

data/lib/fluent/plugin/out_ikachan.rb

@@ -19,6 +19,7 @@ class Fluent::IkachanOutput < Fluent::Output
   config_param :time_key, :string, :default => nil
   config_param :time_format, :string, :default => nil
   config_param :tag_key, :string, :default => 'tag'
+  config_param :post_per_line, :bool, :default => true
 
   def initialize
     super
@@ -104,31 +105,29 @@ class Fluent::IkachanOutput < Fluent::Output
   end
 
   def emit(tag, es, chain)
-    messages = []
-    privmsg_messages = []
+    posts = []
 
-    es.each {|time,record|
-      messages << evaluate_message(@message, @out_keys, tag, time, record) if @message
-      privmsg_messages << evaluate_message(@privmsg_message, @privmsg_out_keys, tag, time, record) if @privmsg_message
-    }
-
-    messages.each do |msg|
-      begin
-        msg.split("\n").each do |m|
-          res = http_post_request(@notice_uri, {'channel' => @channel, 'message' => m})
-        end
-      rescue
-        log.warn "out_ikachan: failed to send notice to #{@host}:#{@port}, #{@channel}, message: #{msg}"
+    es.each do |time,record|
+      if @message
+        posts << [:notice, evaluate_message(@message, @out_keys, tag, time, record)]
+      end
+      if @privmsg_message
+        posts << [:privmsg, evaluate_message(@privmsg_message, @privmsg_out_keys, tag, time, record)]
       end
     end
 
-    privmsg_messages.each do |msg|
+    posts.each do |type, msg|
+      uri = (type == :privmsg ? @privmsg_uri : @notice_uri)
       begin
-        msg.split("\n").each do |m|
-          res = http_post_request(@privmsg_uri, {'channel' => @channel, 'message' => m})
+        if @post_per_line
+          msg.split("\n").each do |m|
+            res = http_post_request(uri, {'channel' => @channel, 'message' => m})
+          end
+        else
+          res = http_post_request(uri, {'channel' => @channel, 'message' => msg})
         end
       rescue
-        log.warn "out_ikachan: failed to send privmsg to #{@host}:#{@port}, #{@channel}, message: #{msg}"
+        log.warn "out_ikachan: failed to send notice to #{@host}:#{@port}, #{@channel}, message: #{msg}"
       end
     end
 

data/test/plugin/test_out_ikachan.rb

@@ -50,6 +50,19 @@ class IkachanOutputTest < Test::Unit::TestCase
     tag_key tag
   ]
 
+  CONFIG_POST_PER_LINE_FALSE = %[
+    host localhost
+    channel morischan
+    message out_ikachan: %s [%s] %s\\nRETURN
+    out_keys tag,time,msg
+    privmsg_message out_ikachan: %s [%s] %s\\nRETURN
+    privmsg_out_keys tag,time,msg
+    time_key time
+    time_format %Y/%m/%d %H:%M:%S
+    tag_key tag
+    post_per_line false
+  ]
+
   CONFIG_HOST_NIL = %[
     channel morischan
     message out_ikachan: %s [%s] %s
@@ -140,6 +153,8 @@ class IkachanOutputTest < Test::Unit::TestCase
     assert_equal '#morischan', d.instance.channel
     d = create_driver(CONFIG_LINE_FEED)
     assert_equal '#morischan', d.instance.channel
+    d = create_driver(CONFIG_POST_PER_LINE_FALSE)
+    assert_equal '#morischan', d.instance.channel
     assert_raise Fluent::ConfigError do
       create_driver(CONFIG_HOST_NIL)
     end
@@ -314,6 +329,40 @@ class IkachanOutputTest < Test::Unit::TestCase
     assert_equal "RETURN", @posted[i][:message]
   end
 
+  # CONFIG_POST_PER_LINE_FALSE = %[
+  #   host localhost
+  #   channel morischan
+  #   message out_ikachan: %s [%s] %s\\nRETURN
+  #   out_keys tag,time,msg
+  #   privmsg_message out_ikachan: %s [%s] %s\\nRETURN
+  #   privmsg_out_keys tag,time,msg
+  #   time_key time
+  #   time_format %Y/%m/%d %H:%M:%S
+  #   tag_key tag
+  #   post_per_line false
+  # ]
+  def test_post_per_line_false
+    d = create_driver(CONFIG_POST_PER_LINE_FALSE)
+    t = Time.now
+    time = t.to_i
+    ts = t.strftime(d.instance.time_format)
+    d.run do
+      d.emit({'msg' => "both notice and privmsg message from fluentd out_ikachan: testing now\ntesting second line"}, time)
+    end
+
+    assert_equal 2, @posted.length
+
+    i = 0
+    assert_equal 'notice', @posted[i][:method]
+    assert_equal '#morischan', @posted[i][:channel]
+    assert_equal "out_ikachan: test [#{ts}] both notice and privmsg message from fluentd out_ikachan: testing now\ntesting second line\nRETURN", @posted[i][:message]
+
+    i += 1
+    assert_equal 'privmsg', @posted[i][:method]
+    assert_equal '#morischan', @posted[i][:channel]
+    assert_equal "out_ikachan: test [#{ts}] both notice and privmsg message from fluentd out_ikachan: testing now\ntesting second line\nRETURN", @posted[i][:message]
+  end
+
   # CONFIG_BASE_URI = %[
   #   base_uri http://localhost:4979/ikachan/
   #   channel morischan

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-ikachan
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake