fluent-plugin-tail_path 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b4639f29d0249ebd21ba0e5691498bf4b78e301
-  data.tar.gz: 2e6c03cb4576e8454348da3785b76edd5425f908
+  metadata.gz: 88f11331238a6584b6ab7b811edeb79cf02a9743
+  data.tar.gz: 617b94b24763f6bd972a6cfc0f4a931fcefad468
 SHA512:
-  metadata.gz: 4e6b5b7ac271210134c713f97ca1eca279fccf46e278db730e8d34d841aa7f5b6ac40f18c480acebff9d53231c28ede20c87333cc1ee223ce8ef8b0aa431869d
-  data.tar.gz: 1d02771648360cddea2c64a2d2d0d36eb9b409ecd687ce9da2eebd39c8bbed28ee06ec08ee133121c375e508c1a9db1f973dcaca8898598da11b415905325e75
+  metadata.gz: c91fe5f2ea0bf0e4ee7707c6094eb7324513bf72f0699dd7121b55261b9bf59ade730e3fd390b7b602cf7c6dc6c654020c938ee5fd8797db9ff17c053eadeba5
+  data.tar.gz: 144cf81e952b726b6bc8056e4faa7fb24f36e195fb1296047a6c51ed2489c9e8e30a22d08f548e4f713ae0270671a2881d7b7f8dc08360a304328e09d1a564e5

data/.travis.yml

@@ -4,3 +4,4 @@ rvm:
   - 2.1.*
 gemfile:
   - Gemfile
+  - "Gemfile.fluentd.lt.0.10.50"

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.0.2 (2014/08/04)
+
+Fixes:
+
+* Fix to support fluentd >= 0.10.50
+
 ## 0.0.1
 
 First version

data/Gemfile.fluentd.lt.0.10.50

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

data/README.md

@@ -1,8 +1,16 @@
 # fluent-plugin-tail_path
 
+[![Build Status](https://secure.travis-ci.org/sonots/fluent-plugin-tail_path.png?branch=master)](http://travis-ci.org/sonots/fluent-plugin-tail_path)
+
 ## About
 
-This is an extension of fluentd in\_tail plugin to add `path` field which tells the log path being tailed
+This is an extension of fluentd in\_tail plugin to add `path` field which tells the log path being tailed. 
+
+This plugin was created based on a pull request [fluentd#281](https://github.com/fluent/fluentd/pull/281). 
+
+## Requirements
+
+Fluentd v0.10.45 or above. 
 
 ## Parameters
 

data/fluent-plugin-tail_path.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-tail_path"
-  s.version     = "0.0.1"
+  s.version     = "0.0.2"
   s.authors     = ["szhem", "Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-tail_path"

data/lib/fluent/plugin/in_tail_path.rb

@@ -9,21 +9,45 @@ class Fluent::NewTailPathInput < Fluent::NewTailInput
     super
   end
 
-  # Override to add path field
-  def convert_line_to_event(line, es, tail_watcher)
-    begin
-      line.chomp!  # remove \n
-      time, record = parse_line(line)
-      if time && record
-        record[@path_key] ||= tail_watcher.path unless @path_key.nil?
-        es.add(time, record)
-      else
-        log.warn "pattern not match: #{line.inspect}"
+  if method_defined?(:parse_line) # fluentd < 0.10.50
+
+    # Override to add path field
+    def convert_line_to_event(line, es, tail_watcher)
+      begin
+        line.chomp!  # remove \n
+        time, record = parse_line(line)
+        if time && record
+          record[@path_key] ||= tail_watcher.path unless @path_key.nil? # custom
+          es.add(time, record)
+        else
+          log.warn "pattern not match: #{line.inspect}"
+        end
+      rescue => e
+        log.warn line.dump, :error => e.to_s
+        log.debug_backtrace(e)
       end
-    rescue => e
-      log.warn line.dump, :error => e.to_s
-      log.debug_backtrace(e)
     end
+
+  else # fluentd >= 0.10.50
+
+    # Override to add path field
+    def convert_line_to_event(line, es, tail_watcher)
+      begin
+        line.chomp!  # remove \n
+        @parser.parse(line) { |time, record|
+          if time && record
+            record[@path_key] ||= tail_watcher.path unless @path_key.nil? # custom
+            es.add(time, record)
+          else
+            log.warn "pattern not match: #{line.inspect}"
+          end
+        }
+      rescue => e
+        log.warn line.dump, :error => e.to_s
+        log.debug_backtrace(e)
+      end
+    end
+
   end
 
   # Override to pass tail_watcher to convert_line_to_event

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-tail_path
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - szhem
@@ -9,62 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.45
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.45
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Fluentd in_tail extension to add `path` field
@@ -74,10 +74,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.fluentd.lt.0.10.50
 - LICENSE
 - README.md
 - Rakefile
@@ -94,17 +95,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: fluent-plugin-tail_path
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Fluentd in_tail extension to add `path` field