fluent-plugin-named_pipe 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d07b39b6f3847cf4c06b65005af568aa30c174b
-  data.tar.gz: 9d76bb33a6cc162c16112f560a2b2ff463618dae
+  metadata.gz: a5034743f0d689be092bb85e3b3dad91e7883147
+  data.tar.gz: b6c1a96e9972546bbb14fe34101ebde66283461a
 SHA512:
-  metadata.gz: 80e1bccd49cff7284b76d919f604c1ed57ab80e6ecf7a8fe71235da91f604b4f1bbd2616f52fc62389c991af0f1006cd0f77780c4c1177239d9fac950cf4e1dd
-  data.tar.gz: 292d56dc7656074c5d3c4fa8f95ab860c2c94a56b347ec6e63be74b8a19171c1c00358abff242616e0f1add7cac6127e0d1513a22c4899b1be4d8319c7868bd0
+  metadata.gz: 7611d8aa5a27a979c884c520887452672c71d0f827225c352e7b9154dec2b94e1ff7823b3d3e239da952f97c74b4d7cdcd5910de55e4e90f4fcb276b57211535
+  data.tar.gz: dc6cb4142953e05a205f39b5f8b1b428010e736b5a998fb0fae61eef8e68c3512ff30056252bd57cb82e8e2ab56fb87c970ddf4c1f0c41968b97f7b86d180a64

data/.travis.yml

@@ -1,6 +1,10 @@
 rvm:
-  - 1.9.3
-  - 2.0.0
   - 2.1.*
+  - 2.2.*
+  - 2.3.*
 gemfile:
   - Gemfile
+  - Gemfile.v0.10
+  - Gemfile.v0.12
+before_install:
+  - gem update bundler

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.2.0 (2017/12/02)
+
+Changes:
+
+* Drop Windows Support
+
+Enhancenments:
+
+* Create lib/fluent/plugin/fifo.rb as own fifo library because `ruby-fifo` gem looks like not maintained (thanks to m-mizutani)
+  * Use `IO.sysread instead` of `File.read` to avoid read blocking 
+  * Add error handling for EOF
+
 ## 0.1.2 (2015/08/04)
 
 Fixes:

data/Gemfile.v0.10

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+gemspec
+gem 'fluentd', '~> 0.10.0'

data/Gemfile.v0.12

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+gemspec
+gem 'fluentd', '~> 0.12.0'

data/fluent-plugin-named_pipe.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-named_pipe"
-  s.version     = "0.1.2"
+  s.version     = "0.2.0"
   s.authors     = ["Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-named_pipe"
@@ -17,12 +17,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "fluentd", ">= 0.10.58"
-  s.add_runtime_dependency "ruby-fifo", "0.0.1"
-  if RUBY_PLATFORM =~ /mswin|mingw/i
-    s.add_runtime_dependency "win32-pipe"
-  else
-    s.add_runtime_dependency "mkfifo"
-  end
+  # File.mkfifo is available from ruby >= 2.3.0, though
+  s.add_runtime_dependency "mkfifo"
+
   s.add_development_dependency "rake"
   s.add_development_dependency "test-unit"
   s.add_development_dependency "pry"

data/lib/fluent/plugin/in_named_pipe.rb

@@ -1,3 +1,6 @@
+require 'fluent/input'
+require_relative 'named_pipe/fifo'
+
 module Fluent
   class NamedPipeInput < Input
     Fluent::Plugin.register_input('named_pipe', self)
@@ -10,16 +13,16 @@ module Fluent
       define_method(:log) { $log }
     end
 
-    def initialize
-      require 'fifo'
-      super
+    # Define `router` method of v0.12 to support v0.10 or earlier
+    unless method_defined?(:router)
+      define_method("router") { Fluent::Engine }
     end
 
     def configure(conf)
       super
 
       begin
-        pipe = Fifo.new(@path, :r, :nowait)
+        pipe = PluginNamedPipe::Fifo.new(@path, :r)
         pipe.close # just to try open
       rescue => e
         raise ConfigError, "#{e.class}: #{e.message}"
@@ -42,16 +45,19 @@ module Fluent
     end
 
     def run
-      @pipe = Fifo.new(@path, :r, :wait)
+      @pipe = PluginNamedPipe::Fifo.new(@path, :r)
 
       while @running
         begin
           line = @pipe.readline # blocking
-          time, record = @parser.parse(line)
-          if time and record
-            Engine.emit(@tag, time, record)
-          else
-            log.warn "Pattern not match: #{line.inspect}"
+          next if line.nil?
+          
+          @parser.parse(line) do |time, record|
+            if time and record
+              router.emit(@tag, time, record)
+            else
+              log.warn "Pattern not match: #{line.inspect}"
+            end
           end
         rescue => e
           log.error "in_named_pipe: unexpected error", :error_class => e.class, :error => e.to_s

data/lib/fluent/plugin/named_pipe/fifo.rb

@@ -0,0 +1,54 @@
+require 'forwardable'
+require 'mkfifo'
+
+module Fluent
+  module PluginNamedPipe
+    class Fifo
+      extend Forwardable
+
+      READ_TIMEOUT = 1
+
+      def initialize(file_path, mode = :r)
+        if !File.exist?(file_path)
+          File.mkfifo(file_path)
+          File.chmod(0666, file_path)
+        end
+
+        @file_path = file_path
+        @mode = mode
+        self.open
+
+        @buf = ''
+      end
+
+      def_delegators :@pipe, :read, :write, :close, :flush
+
+      def open
+        m = {:r => 'r+', :w => 'w+'}[@mode]
+        @pipe = File.open(@file_path, m)
+      end
+
+      def readline
+        res = IO.select([@pipe], [], [], READ_TIMEOUT)
+        return nil if res.nil?
+
+        while nil == (idx = @buf.index("\n")) do
+          tmp = ''
+          begin
+            s = @pipe.sysread(0xffff, tmp)
+            @buf << s
+          rescue EOFError
+            # reopen
+            @pipe.close
+            @pipe.open
+          end
+        end
+
+        line = @buf[0, idx + 1]
+        @buf = @buf[idx + 1, @buf.length - line.length]
+        return line
+      end
+
+    end
+  end
+end

data/lib/fluent/plugin/out_named_pipe.rb

@@ -1,3 +1,5 @@
+require_relative 'named_pipe/fifo'
+
 module Fluent
   class NamedPipeOutput < Output
     Plugin.register_output('named_pipe', self)
@@ -9,16 +11,11 @@ module Fluent
       define_method(:log) { $log }
     end
 
-    def initialize
-      require 'fifo'
-      super
-    end
-
     def configure(conf)
       super
 
       begin
-        @pipe = Fifo.new(@path, :w, :nowait)
+        @pipe = PluginNamedPipe::Fifo.new(@path, :w)
       rescue => e
         raise ConfigError, "#{e.class}: #{e.message}"
       end
@@ -34,6 +31,7 @@ module Fluent
     def emit(tag, es, chain)
       es.each do |time, record|
         @pipe.write @formatter.format(tag, time, record)
+        @pipe.flush
       end
 
       chain.next

data/test/test_in_named_pipe.rb

@@ -43,8 +43,9 @@ class NamedPipeInputTest < Test::Unit::TestCase
     test 'read and emit' do
       d = create_driver(CONFIG)
       d.run {
-        pipe = Fifo.new(TEST_PATH, :w, :nowait)
+        pipe = ::Fluent::PluginNamedPipe::Fifo.new(TEST_PATH, :w)
         pipe.write "foo:bar\n"
+        pipe.flush
       }
 
       emits = d.emits
@@ -53,6 +54,30 @@ class NamedPipeInputTest < Test::Unit::TestCase
         assert_equal({"foo"=>"bar\n"}, record)
       end
     end
+
+    
+    test 'fragmented emit' do
+      d = create_driver(CONFIG)
+      d.run {
+        pipe = ::Fluent::PluginNamedPipe::Fifo.new(TEST_PATH, :w)
+        pipe.write "fo"
+        pipe.flush
+        sleep 0.2
+        pipe.write "o:ba"
+        pipe.flush
+        sleep 0.2
+        pipe.write "r\n"
+        pipe.flush
+      }
+
+      emits = d.emits
+      emits.each do |tag, time, record|
+        assert_equal("named_pipe", tag)
+        assert_equal({"foo"=>"bar\n"}, record)
+      end
+    end
+
+    
   end
 end
 

data/test/test_out_named_pipe.rb

@@ -1,7 +1,6 @@
 require_relative 'helper'
 require 'fluent/test'
 require 'fluent/plugin/out_named_pipe'
-require 'fifo'
 
 Fluent::Test.setup
 
@@ -48,7 +47,7 @@ class NamedPipeOutputTest < Test::Unit::TestCase
     test 'reader is waiting' do
       readline = nil
       thread = Thread.new {
-        pipe = Fifo.new(TEST_PATH, :r, :wait)
+        pipe = ::Fluent::PluginNamedPipe::Fifo.new(TEST_PATH, :r)
         readline = pipe.readline
       }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-named_pipe
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-28 00:00:00.000000000 Z
+date: 2017-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.58
-- !ruby/object:Gem::Dependency
-  name: ruby-fifo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: mkfifo
   requirement: !ruby/object:Gem::Requirement
@@ -119,11 +105,14 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.v0.10
+- Gemfile.v0.12
 - LICENSE
 - README.md
 - Rakefile
 - fluent-plugin-named_pipe.gemspec
 - lib/fluent/plugin/in_named_pipe.rb
+- lib/fluent/plugin/named_pipe/fifo.rb
 - lib/fluent/plugin/out_named_pipe.rb
 - test/helper.rb
 - test/test_in_named_pipe.rb
@@ -148,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Named pipe input/output plugin for Fluentd