fluent-plugin-map 0.0.3.1 → 0.0.4

data/fluent-plugin-map.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-map"
-  s.version     = "0.0.3.1"
+  s.version     = "0.0.4"
   s.authors     = ["Kohei Tomita"]
   s.email       = ["tommy.fmale@gmail.com"]
   s.homepage    = "https://github.com/tomity/fluent-plugin-map"

data/lib/fluent/plugin/out_map.rb

@@ -9,6 +9,7 @@ module Fluent
     config_param :time, :string, :default => nil
     config_param :record, :string, :default => nil
     config_param :multi, :bool, :default => false
+    config_param :timeout, :time, :default => 1
 
     def configure(conf)
       super
@@ -27,16 +28,53 @@ module Fluent
 
     def emit(tag, es, chain)
       begin
-        tuples = []
-        es.each {|time, record|
+        tag_output_es = do_map(tag, es)
+        tag_output_es.each_pair do |tag, output_es|
+          Fluent::Engine::emit_stream(tag, output_es)
+        end
+        chain.next
+        tag_output_es
+      rescue SyntaxError => e
+        chain.next
+        $log.error "map command is syntax error: #{@map}"
+        e #for test
+      end
+    end
+
+    def do_map(tag, es)
+      tuples = if @multi
+                 generate_tuples_multi(tag, es)
+               else
+                 generate_tuples_single(tag, es)
+               end
+      tag_output_es = Hash.new{|h, key| h[key] = MultiEventStream::new}
+      tuples.each do |tag, time, record|
+        if time == nil || record == nil
+          raise SyntaxError.new
+        end
+        tag_output_es[tag].add(time, record)
+        $log.trace { [tag, time, record].inspect }
+      end
+      tag_output_es
+    end
+
+    def generate_tuples_multi(tag, es)
+      tuples = []
+      es.each {|time, record|
+        new_tuple = eval(@map)
+        tuples.concat new_tuple
+      }
+     tuples
+    end
+
+    def generate_tuples_single(tag, es)
+      tuples = []
+      es.each {|time, record|
+        timeout_block(tag, time, record){
           case @mode
           when "tuple"
             new_tuple = eval(@map)
-            if @multi
-              tuples.concat new_tuple
-            else
-              tuples << new_tuple
-            end
+            tuples << new_tuple
           when "each"
             new_tag = eval(@tag)
             new_time = eval(@time)
@@ -44,19 +82,17 @@ module Fluent
             tuples << [new_tag, new_time, new_record]
           end
         }
-        tuples.each do |tag, time, record|
-          if time == nil or record == nil
-            raise SyntaxError.new
-          end
-          $log.trace { [tag, time, record].inspect }
-          Fluent::Engine::emit(tag, time, record)
-        end
-        chain.next
-        tuples
-      rescue SyntaxError => e
-        chain.next
-        $log.error "map command is syntax error: #{@map}"
-        e #for test
+      }
+     tuples
+    end
+
+    def timeout_block(tag, time, record)
+      begin
+        Timeout.timeout(@timeout){
+          yield
+        }
+      rescue Timeout::Error
+        $log.error {"Timeout: #{Time.at(time)} #{tag} #{record.inspect}"}
       end
     end
   end

data/test/plugin/test_out_map.rb

@@ -173,4 +173,22 @@ class MapOutputTest < Test::Unit::TestCase
       ], tag
     }
   end
+
+  def test_timeout
+    tag = 'tag'
+    time = Time.local(2012, 10, 10, 10, 10, 10)
+    record = {'code' => '300'}
+
+    d1 = create_driver %[
+      key "newtag"
+      time sleep 10
+      record record
+      timeout 1s
+    ], tag
+    d1.run do
+      d1.emit(record, time)
+    end
+    emits = d1.emits
+    assert_equal 0, emits.length
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-map
 version: !ruby/object:Gem::Version
-  version: 0.0.3.1
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-11 00:00:00.000000000Z
+date: 2012-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70202612149300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70202612149300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &70202612148700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +37,12 @@ dependencies:
         version: 0.10.24
   type: :development
   prerelease: false
-  version_requirements: *70202612148700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.24
 description: ! 'fluent-plugin-map is the non-buffered plugin that can convert an event
   log to different event log(s).  '
 email:
@@ -69,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-map
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: fluent-plugin-map is the non-buffered plugin that can convert an event log