fluent-plugin-forest 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea721095d308823baadbc9e6296c076c75d1011f
-  data.tar.gz: d5d3ae86ae4638783e7f8286373c1b47906068b9
+  metadata.gz: a3258fc645b387ab5f9dbd03981fff601d5ee66a
+  data.tar.gz: 1254f5e53ce7d0ecb7195033c459f3a02c7d1976
 SHA512:
-  metadata.gz: a0ce28f5b60185e4758367ef918990cf18537e8a5b5bcaa308b7d554efd4ff810c0bda0825262fd11510abdbaced8c39ff85566b8cc51d21df88b849db759d65
-  data.tar.gz: 061c8287095c952c4fc94be45bc24e755f86dc067c1130fc34b1ab1a4830bb7d4cf9bdab1a6ee48522c6b18ca498495c53bad71f8df0227619a0e1f4a28181f5
+  metadata.gz: d4a445761e331b96e551a18c18937bfef3dff23ea71d9510d3f4e40be851b66364ed8eb63acc7a76d59d007f639023eb459cc01696bc8f8af237d6ce2f9e3e1a
+  data.tar.gz: f038b8287ff57a31ff260af1de9e8449e5659042719d81242551de828889d07a26497526521c3aa277b4ebe7ac66ca5d6d710c43d33154e790938f6f93070708

data/README.md

@@ -1,5 +1,7 @@
 # fluent-plugin-forest
 
+This is a plugin for [Fluentd](http://fluentd.org).
+
 ## Component
 
 ### ForestOutput

data/fluent-plugin-forest.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-forest"
-  gem.version       = "0.2.3"
+  gem.version       = "0.2.4"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.description   = %q{create sub-plugin dynamically per tags, with template configuration and parameters}

data/lib/fluent/plugin/out_forest.rb

@@ -9,6 +9,11 @@ class Fluent::ForestOutput < Fluent::MultiOutput
 
   attr_reader :outputs
 
+  # Define `log` method for v0.10.42 or earlier
+  unless method_defined?(:log)
+    define_method("log") { $log }
+  end
+
   def configure(conf)
     super
 
@@ -67,23 +72,23 @@ class Fluent::ForestOutput < Fluent::MultiOutput
     e.each do |k,v|
       v = v.gsub(/__TAG_PARTS\[-?[0-9]+(?:\.\.\.?-?[0-9]+)?\]__|\$\{tag_parts\[-?[0-9]+(?:\.\.\.?-?[0-9]+)?\]\}/) do |tag_parts_matched|
         matched = /\[(?<first>-?[0-9]+)(?<range_part>(?<range_type>\.\.\.?)(?<last>-?[0-9]+))?\]/.match(tag_parts_matched)
-        if matched && matched[:range_part]
+        raise "BUG: gsub regex matches but index regex does not match" unless matched
+
+        if matched[:range_part]
           exclude_end = (matched[:range_type] == '...')
           range = Range.new(matched[:first].to_i, matched[:last].to_i, exclude_end)
           if tag_parts[range]
             tag_parts[range].join(".")
           else
-            $log.warn "out_forest: missing placeholder. tag:#{tag} placeholder:#{tag_parts_matched} conf:#{k} #{v}"
+            log.warn "out_forest: missing placeholder. tag:#{tag} placeholder:#{tag_parts_matched} conf:#{k} #{v}"
             nil
           end
-        elsif matched # non range index (without range_part)
+        else # non range index (without range_part)
           index = matched[:first].to_i
           unless tag_parts[index]
-            $log.warn "out_forest: missing placeholder. tag:#{tag} placeholder:#{tag_parts_matched} conf:#{k} #{v}"
+            log.warn "out_forest: missing placeholder. tag:#{tag} placeholder:#{tag_parts_matched} conf:#{k} #{v}"
           end
           tag_parts[index]
-        else
-          raise "BUG: gsub regex matches but index regex does not match"
         end
       end
       v = v.gsub('__ESCAPED_TAG__', escaped_tag).gsub('${escaped_tag}', escaped_tag)
@@ -130,16 +135,16 @@ class Fluent::ForestOutput < Fluent::MultiOutput
           @outputs.push(output)
         end
       }
-      $log.info "out_forest plants new output: #{@subtype} for tag '#{tag}'"
+      log.info "out_forest plants new output: #{@subtype} for tag '#{tag}'"
     rescue Fluent::ConfigError => e
-      $log.error "failed to configure sub output #{@subtype}: #{e.message}"
-      $log.error e.backtrace.join("\n")
-      $log.error "Cannot output messages with tag '#{tag}'"
+      log.error "failed to configure sub output #{@subtype}: #{e.message}"
+      log.error e.backtrace.join("\n")
+      log.error "Cannot output messages with tag '#{tag}'"
       output = nil
     rescue StandardError => e
-      $log.error "failed to configure/start sub output #{@subtype}: #{e.message}"
-      $log.error e.backtrace.join("\n")
-      $log.error "Cannot output messages with tag '#{tag}'"
+      log.error "failed to configure/start sub output #{@subtype}: #{e.message}"
+      log.error e.backtrace.join("\n")
+      log.error "Cannot output messages with tag '#{tag}'"
       output = nil
     end
     output

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-forest
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !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: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: create sub-plugin dynamically per tags, with template configuration and
@@ -46,8 +46,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -68,17 +68,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.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: plugin to create output plugin instances per tags dynamically
@@ -87,4 +87,3 @@ test_files:
 - test/output/out_forest_test.rb
 - test/plugin/test_out_forest.rb
 - test/plugin/test_out_forest_test.rb
-has_rdoc: