fluent-plugin-bin 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb3e6c6f8011ebabd99c18bce4c692265daae3af
-  data.tar.gz: ef3f2083ef9c77f90935ed411221f0cc9b70a6d7
+  metadata.gz: ebd76b9496c7a4b04740de272ebc348cd71011f0
+  data.tar.gz: fbfa773cf99e560df185f5d2fda4b1e45b762eba
 SHA512:
-  metadata.gz: 80d047db3a9ff73548444db5be839e85153a53d7cecc5e959583164ce5979b012700cb12445dfb691b5c4e805fea611d0934ba5ff52c2a78b56934fc1195943c
-  data.tar.gz: 5ab88e6341f9249f7cd026a64bc1ddd24425c0456ad9ada238d791335fcdb0a6c230422a584e08acb7c3c4fb557fb68bc2e7c00bb0de4838d7c0bc96a27f2997
+  metadata.gz: a4a303085122c573c707b97f4a688d602d7e888658f97f01c82f3d18b858955c9cc142273de624c886ba7b2e95d4f9d5407f8a0d6a4aead592ecf9a253ac59e4
+  data.tar.gz: 0918b80c360a334beaa1d0db9482dfadad696e88b7a83d2f0161b35978dd4bd3f94cd53ea2ae6940e4c523bf71a22778eea06d988c11d106b748b4276b5f1e19

data/fluent-plugin-bin.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
     gem.name            = "fluent-plugin-bin"
-    gem.version         = "0.1"
+    gem.version         = "0.2"
     gem.authors         = ["Klaus Wölfel"]
     gem.email           = ["klaus@nexedi.com"]
     gem.summary         = %q{Fluentd input plugin for binary files}
@@ -11,5 +11,5 @@ Gem::Specification.new do |gem|
     gem.files           = `git ls-files -z`.split("\x0")
     gem.require_paths   = ["lib"]
 
-    gem.add_runtime_dependency "fluentd", "~> 0.12"
+    gem.add_runtime_dependency "fluentd", "~> 0.14"
 end

data/lib/fluent/plugin/in_bin.rb

@@ -15,12 +15,12 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-require 'fluent/input'
+require 'fluent/plugin/in_tail'
 
-module Fluent
+module Fluent::Plugin
   
-  class BinInput < NewTailInput
-    Plugin.register_input('bin', self)
+  class BinInput < TailInput
+    Fluent::Plugin.register_input('bin', self)
     
     def convert_line_to_event(line, es, tail_watcher)
       begin
@@ -34,11 +34,14 @@ module Fluent
     def setup_watcher(path, pe)
       line_buffer_timer_flusher = (@multiline_mode && @multiline_flush_interval) ? TailWatcher::LineBufferTimerFlusher.new(log, @multiline_flush_interval, &method(:flush_buffer)) : nil
       tw = TailWatcher.new(path, @rotate_wait, pe, log, @read_from_head, @enable_watch_timer, @read_lines_limit, method(:update_watcher), line_buffer_timer_flusher,  &method(:receive_lines))
-      tw.attach(@loop)
+      tw.attach do |watcher|
+         timer_execute(:in_tail_timer_trigger, 1, &watcher.method(:on_notify)) if watcher.enable_watch_timer
+         event_loop_attach(watcher.stat_trigger)
+      end
       tw
     end
 
-    class TailWatcher < NewTailInput::TailWatcher
+    class TailWatcher < TailInput::TailWatcher
       def on_rotate(io)
         if @io_handler == nil
           if io
@@ -104,7 +107,7 @@ module Fluent
 
         def swap_state(pe)
           # Use MemoryPositionEntry for rotated file temporary
-          mpe = MemoryPositionEntry.new
+          mpe = TailInput::MemoryPositionEntry.new
           mpe.update(pe.read_inode, pe.read_pos)
           @pe = mpe
           @io_handler.pe = mpe # Don't re-create IOHandler because IOHandler has an internal buffer.
@@ -113,7 +116,7 @@ module Fluent
         end
       end
 
-      class IOHandler  < NewTailInput::TailWatcher::IOHandler
+      class IOHandler  < TailInput::TailWatcher::IOHandler
         def initialize(io, pe, log, read_lines_limit, first = true, &receive_lines)
           @log = log
           @log.info "following #{io.path}" if first
@@ -161,4 +164,4 @@ module Fluent
       end
     end
   end
-end
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-bin
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Klaus Wölfel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-08 00:00:00.000000000 Z
+date: 2016-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.14'
 description: Fluentd input plugin to read binary files based on in_tail
 email:
 - klaus@nexedi.com
@@ -46,17 +46,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Fluentd input plugin for binary files