fluent-output-router 0.9.2 → 0.9.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDY1YjVmZWE4MjE5YWEzNjZhYzlkMWU3MjM4N2E2MTk0N2M4MjAyMQ==
+    MWRhOGYwN2Y4MjUwNjYyYjViNDA2ZjA2NzMzZDk0NWRmZWI2NTFiNQ==
   data.tar.gz: !binary |-
-    NTQxMWZjZjI4YzBiMmU0ZGEwYmMyNTIxY2M4NzA2MTM3NDk2YTVkYw==
+    MTg0ZjM5NmY2MDcxOGMwMzdjOWU4NDlkMDk4ZjM5MGQyNDM0NGY3Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODZjY2ZhNDQyYWY4MjU2ODlkMWY0ZDFlOGQ0ODQ2ZTUxYjY0ZjU1ZTk2MDM5
-    NmY5OGE2MTgyYWRiM2U0Yzk2ODFkNTczZWU1YjBlM2YxN2JjOGRkMDk0MjFi
-    ZTA5OWVmYmM3OTI3YTZlY2Y5YWE0MTY5YjQ1ZGY0ZTNiYzU0NGM=
+    NjcyNWZlY2EyMmFjZjJlODNhZDgxNzRhYjIxOTU0ZWQ3MWYzMTcwMGZlMTU0
+    ZTk4Y2ZlMGMxODRmMTliODYyZmQxMzI0ODA3YjZmYTBhOWY4YmUyMWExMTA1
+    ZjE3ZTllNzQ5M2Y2MTY2YThjM2U5Y2RlNjBhNjdmZWQzOGY1YmE=
   data.tar.gz: !binary |-
-    NjM0ZjMxMGI0Mzc1ZDI5YjA0Y2E2NzNiNGY2NGYyYzY2MWU0YTY5OGMyMGFj
-    OTQ3MzZhMWM3YjhiNTRmZjQ3NjhhM2E2ZjM0MDNhYjI0ZjQ2ZDQ5YWQ5ODgx
-    NDA5Zjk5ZTkwODQxYjIyYzlkNDljNDQxYzZhYzQ2Mzk4YTA2ZDQ=
+    NGI0OGU0NTYwODNlNjljOTA4NTYxMTZjMmJhNmY3N2Y5MzIzZDcxNzBiZmU5
+    ZTUwZDJmMjk5N2Q1OTc2NDdmMmI1MWRhN2I0MGUzM2FiY2RmZDE5MmEyN2M0
+    NjFjNmJjNjc4OGQwYzY1MDdiZDlkMTZhOWJkYTRmZDkzZTUxNzM=

data/lib/fluent/plugin/out_router.rb

@@ -17,12 +17,13 @@
 require 'erb'
 require 'rubygems'
 require 'json'
+require 'thread'
 
 module Fluent
   class RouterOutput < Fluent::Output
 
     Fluent::Plugin.register_output('router', self)
-    MIN_REAPER_INTERVAL = 5 #sec
+    MIN_REAPER_INTERVAL = 15 #sec
     ROUTER_STATE_FILE = "router_state.json"
 
     def initialize
@@ -30,6 +31,7 @@ module Fluent
       @outputs = {}
       @last_used_time = {}
       @last_reaper_run = Time.now
+      @semaphore = Mutex.new
     end
 
     def configure(conf)
@@ -71,18 +73,25 @@ module Fluent
 
     private
 
+    # start_output is synchroned with a mutex
+    # to avoid any concurrency problems if the input plugin is multithreaded
+    # for example: the scribe input plugin is multitreaded by default
     def start_output(key)
-      log "Starting a new output of type " + @output_config['type'] +
-        " for key #{key}"
-      @outputs[key] = Fluent::Plugin.new_output @output_config['type']
-      @last_used_time[key] = Time.now
-      config = @output_config.clone
-      template! config, :key => key
-      out = @outputs[key]
-      out.configure config
-      out.start
-      @state_serializer.store(@outputs.keys)
-      out
+      @semaphore.synchronize do
+        unless @outputs[key]
+          log "Starting a new output of type " + @output_config['type'] +
+            " for key #{key}"
+          @outputs[key] = Fluent::Plugin.new_output @output_config['type']
+          @last_used_time[key] = Time.now
+          config = @output_config.clone
+          template! config, :key => key
+          out = @outputs[key]
+          out.configure config
+          out.start
+          @state_serializer.store(@outputs.keys)
+        end
+        @outputs[key]
+      end
     end
 
     def stop_output(key)
@@ -99,7 +108,6 @@ module Fluent
       conf.elements.each { |e| mark_used e }
     end
 
-    # MUTABLE. WHICH ALSO MEANS IT IS TERRIBLE.
     def template!(conf, keys)
       conf.each do |k,v|
         case v
@@ -120,13 +128,18 @@ module Fluent
 
     # This is the reaper that is used to avoids resource leaks
     # It will stop any active output plugin that does not get any input
+    # The code in run_reaper is synchroned with a mutex
+    # to avoid any concurrency problems if the input plugin is multithreaded
+    # for example: the scribe input plugin is multitreaded by default
     def run_reaper(now)
       if now - @last_reaper_run > MIN_REAPER_INTERVAL then
-        @last_used_time.each {|key, stored_time|
-          if now - stored_time > @inactivity_timeout then
-            stop_output(key)
-          end }
-         @last_reaper_run = now
+        @last_reaper_run = now
+        @semaphore.synchronize do
+          @last_used_time.each {|key, stored_time|
+            if now - stored_time > @inactivity_timeout then
+              stop_output(key)
+            end }
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-output-router
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - David Almroth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd