fluent-plugin-tail-ex 0.1.0 → 0.1.1

data/fluent-plugin-tail-ex.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "fluent-plugin-tail-ex"
   gem.require_paths = ["lib"]
-  gem.version       = "0.1.0"
+  gem.version       = "0.1.1"
 
   requires = ['fluentd', 'fluent-mixin-config-placeholders']
   requires.each {|name| gem.add_runtime_dependency name}

data/lib/fluent/plugin/in_tail_ex.rb

@@ -13,6 +13,7 @@ module Fluent
 
     def initialize
       super
+      @ready = false
     end
 
     def configure(conf)
@@ -84,9 +85,13 @@ module Fluent
     end
 
     def start
-      @loop = Coolio::Loop.new
+      paths, @paths = @paths, []
+      super
+      @thread.join
+      @paths = paths
       refresh_watchers
       @refresh_trigger.attach(@loop)
+      @ready = true
       @thread = Thread.new(&method(:run))
     end
 
@@ -98,6 +103,13 @@ module Fluent
       @pf_file.close if @pf_file
     end
 
+    def run
+      # don't run unless ready to avoid coolio error
+      if @ready
+        super
+      end
+    end
+
     class TailExWatcher < TailWatcher
       def initialize(path, rotate_wait, pe, &receive_lines)
         @parent_receive_lines = receive_lines

data/test/plugin/test_in_tail_ex.rb

@@ -9,7 +9,7 @@ class TailExInputTest < Test::Unit::TestCase
 tag tail_ex
 path test/plugin/*/%Y/%m/%Y%m%d-%H%M%S.log,test/plugin/data/log/**/*.log
 format /^(?<message>.*)$/
-pos_file /var/tmp/fluentd.pos
+pos_file test-pos-file
 refresh_interval 30
   ]
   PATHS = [
@@ -26,6 +26,23 @@ refresh_interval 30
     assert_nothing_raised { create_driver }
   end
 
+  def test_posfile_creation
+    flexstub(Thread) do |threadclass|
+      threadclass.should_receive(:new).once.and_return do
+        flexmock('Thread') {|t| t.should_receive(:join).once }
+      end
+      threadclass.should_receive(:new).once
+
+      plugin = create_driver.instance
+      plugin.start
+      pf = nil
+      plugin.instance_eval do
+        pf = @pf
+      end
+      assert_instance_of Fluent::TailInput::PositionFile, pf
+    end
+  end
+
   def test_expand_paths
     plugin = create_driver.instance
     flexstub(Time) do |timeclass|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-tail-ex
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-07 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &70240843162660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70240843162660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fluent-mixin-config-placeholders
-  requirement: &70240843161320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70240843161320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &70240843160000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70240843160000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fluent-mixin-config-placeholders
-  requirement: &70240843157000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70240843157000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70240843155180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70240843155180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &70240843152680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70240843152680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Extended tail input plugin
 email:
 - yt.hisa@gmail.com
@@ -120,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Extended tail input plugin