fluent-plugin-norikra 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f504242a8eb349502eea219ee7ba8c378e1f7f63
-  data.tar.gz: 4b6ae2bbfdc505b8217e44d6770d154aaf58c34b
+  metadata.gz: 8ad302afdc9dbfe8520b8d4efafc200e61014e66
+  data.tar.gz: ef1c67429f4912690dd8351589f50123cf93f227
 SHA512:
-  metadata.gz: 27f5ea700e25021121a250c0737e5644b63ea2c412c3c739debfadf0ccadd16b2e7bf1e24237779a25b3c55f100011a5ff2f2424bd7e038e4d3c00c40bec5656
-  data.tar.gz: 4f30c7a90aef5a8ddf08e062477a77050183a0d08d852a34bff5376c57c791f8795d642324a6fdf049d5bc3a6c4bdb894d9404513b4e9cd873e14966bdde642b
+  metadata.gz: b6efb974e0587929e664ec773bda14b814729c13e9f08d627d466c7c876725ab269d4bb1f029ea07771f858e110df6b19c571793f3c9e3d01df1d4c1bd074071
+  data.tar.gz: 02a0122e9401292e6428a7c37db35cbbb2f8010f9effc8d4551cdc9ecf39c11b5d8ba6e6f258902b78b6b361b35a9cbd4f2bfec5be16b8ffaf5d07b9b0785f1e

data/fluent-plugin-norikra.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-norikra"
-  spec.version       = "0.0.5"
+  spec.version       = "0.0.6"
   spec.authors       = ["TAGOMORI Satoshi"]
   spec.email         = ["tagomoris@gmail.com"]
   spec.description   = %q{process events on fluentd with SQL like query, with built-in Norikra server if needed.}

data/lib/fluent/plugin/out_norikra.rb

@@ -111,6 +111,7 @@ module Fluent
       end
 
       @mutex = Mutex.new
+      @target_mutex = Mutex.new
     end
 
     def client(opts={})
@@ -138,6 +139,7 @@ module Fluent
 
       # register worker thread
       @register_queue = []
+      @registered_targets = {}
       @register_thread = Thread.new(&method(:register_worker))
 
       # fetch worker thread
@@ -228,6 +230,7 @@ module Fluent
               insert_fetch_queue(FetchRequest.new(query)) unless query.tag.empty? || @event_method
             end
             @target_map[t.name] = t
+            @registered_targets.delete(t.name)
           else
             $log.error "Failed to prepare norikra data for target:#{t.name}"
             @norikra_started.push(t)
@@ -262,25 +265,32 @@ module Fluent
       es.each do |time,record|
         target = @target_generator.call(tag, record)
 
-        t = @target_map[target]
-        unless t || tobe_registered_target_names.include?(target)
-          conf = @config_targets[target]
-          unless conf
-            @config_targets.values.each do |c|
-              if c.target_matcher.match(target)
-                conf = c
-                break
+        tgt = @target_mutex.synchronize do
+          t = @target_map[target]
+          unless t
+            unless tobe_registered_target_names.include?(target)
+              conf = @config_targets[target]
+              unless conf
+                @config_targets.values.each do |c|
+                  if c.target_matcher.match(target)
+                    conf = c
+                    break
+                  end
+                end
               end
+              t = Target.new(target, @default_target + conf)
+              @registered_targets[target] = t
+              @register_queue.push(t)
+              tobe_registered_target_names.push(target)
             end
+            t = @registered_targets[target]
           end
-          t = Target.new(target, @default_target + conf)
-          @register_queue.push(t)
-          tobe_registered_target_names.push(target)
+          t
         end
 
-        event = t.filter(record)
+        event = tgt.filter(record)
 
-        out << [t.escaped_name,event].to_msgpack
+        out << [tgt.escaped_name,event].to_msgpack
       end
 
       out

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-norikra
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - TAGOMORI Satoshi