fluent-plugin-forest 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05ff9d75e8864a29e9ae2c43cdff96a137e53062
-  data.tar.gz: f75361da08c4990575e0e8938df23c36f0b64465
+  metadata.gz: 713656d5a6d91a7d692f3027032eb4bfabb38a35
+  data.tar.gz: 7ec3aa61c288b897b637ada4de5453cb67671d8e
 SHA512:
-  metadata.gz: a6b921ca4e6b17126bcf80988eea42a541ec9cb15dcdfd1fe079a9bc0f5f674b6b2b074ff2b1abd7f75362661475f7a5037799fa08b9735a5e2491989b13ffb2
-  data.tar.gz: 7925733f1ce183561d5d4f67ec291c8dfda7e0a024a95fb941ba12cd6cdc19fb28b8d202f9c752d0adcb5178d5a6d0f9196aaba40e079d7c4e3b80decc6bb78e
+  metadata.gz: da758cc90d2f132b293c415c1107e52e2b8b9534059eb50e1f3d731dd6810598aa491f87bc3482b13656125399c52b1c4e5e3b3a20bda0d358d6569535158998
+  data.tar.gz: 0da6213cf2fe98d140bb8c2c872c95b98dab99c9f58fac0496ceb19f3ac6b47f707a8ddf3e4407ddf40f8508de7cb8bd95a3ec9d4658d83a930b5a85a4c899cf

data/.travis.yml

@@ -1,4 +1,8 @@
 language: ruby
+sudo: false
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.1
+  - 2.2
+  - 2.3.0
+before_install:
+  - gem update bundler

data/README.md

@@ -7,7 +7,7 @@ This is a plugin for [Fluentd](http://fluentd.org).
 ### ForestOutput
 
 ForestOutput creates sub plugin instance of a output plugin dynamically per tag, from template configurations.
-In template configurations, you can write configuration lines for overall tags by <template>, and for specified tags by <case TAG_PATTERN>, and you can use \_\_TAG\_\_ (or ${tag}) placeholder at anywhere in <template> and <case>.
+In template configurations, you can write configuration lines for overall tags by `<template>`, and for specified tags by `<case TAG_PATTERN>`, and you can use \_\_TAG\_\_ (or ${tag}) placeholder at anywhere in `<template>` and `<case>`.
 
 This plugin helps you if you are writing very long configurations by copy&paste with a little little diff for many tags.
 
@@ -31,27 +31,27 @@ You SHOULD NOT use ForestOutput for tags increasing infinitly.
 If you are writing long long configurations like below:
 
     <match service.blog>
-      type file
+      @type file
       time_slice_format %Y%m%d%H
-      compress yes
+      compress gz
       path /var/log/blog.*.log
     </match>
     <match service.portal>
-      type file
+      @type file
       time_slice_format %Y%m%d%H
-      compress yes
+      compress gz
       path /var/log/portal.*.log
     </match>
     <match service.news>
-      type file
+      @type file
       time_slice_format %Y%m%d%H
-      compress yes
+      compress gz
       path /var/log/news.*.log
     </match>
     <match service.sns>
-      type file
+      @type file
       time_slice_format %Y%m%d%H
-      compress yes
+      compress gz
       path /var/log/sns.*.log
     </match>
     # ...
@@ -59,12 +59,12 @@ If you are writing long long configurations like below:
 You can write configuration with ForestOutput like below:
 
     <match service.*>
-      type forest
+      @type forest
       subtype file
       remove_prefix service
       <template>
         time_slice_format %Y%m%d%H
-        compress yes
+        compress gz
         path /var/log/${tag}.*.log
       </template>
     </match>
@@ -72,18 +72,17 @@ You can write configuration with ForestOutput like below:
 If you want to place logs /var/archive for `service.search.**` as filename with hostname, without compression, `case` directive is useful:
 
     <match service.*>
-      type forest
+      @type forest
       subtype file
       remove_prefix service
       <template>
         time_slice_format %Y%m%d%H
       </template>
       <case search.**>
-        compress no
         path /var/archive/__TAG__.__HOSTNAME__.*.log
       </case>
       <case *>
-        compress yes
+        compress gz
         path /var/log/__TAG__.*.log
       </case>
     </match>
@@ -91,16 +90,15 @@ If you want to place logs /var/archive for `service.search.**` as filename with
 `case` configuration overwrites `template` configuration, so you can also write like this:
 
     <match service.*>
-      type forest
+      @type forest
       subtype file
       remove_prefix service
       <template>
         time_slice_format %Y%m%d%H
-        compress yes
+        compress gz
         path /var/log/__TAG__.*.log
       </template>
       <case search.**>
-        compress no
         path /var/archive/__TAG__.*.log
       </case>
     </match>
@@ -108,21 +106,21 @@ If you want to place logs /var/archive for `service.search.**` as filename with
 Version 0.2.0 or later, subsections adding/overwriting are supported. About the case below, three `<store>` subsections are defined for `search.**` pattern.
 
     <match service.*>
-      type forest
+      @type forest
       subtype copy
       <template>
         <store>
-          type file
+          @type file
           path /path/to/copy1
         </store>
         <store>
-          type file
+          @type file
           path /path/to/copy2
         </store>
       </template>
       <case search.**>
         <store>
-          type file
+          @type file
           path /path/to/copy3
         </store>
       </case>
@@ -131,7 +129,7 @@ Version 0.2.0 or later, subsections adding/overwriting are supported. About the
 Subsections with same arguments will be overwritten. See this example:
 
     <match service.*>
-      type forest
+      @type forest
       subtype route
       <template>
         <route {search,admin}.a>

data/example/sample.conf

@@ -0,0 +1,11 @@
+<source>
+  @type forward
+</source>
+
+<match test.*>
+  @type forest
+  subtype stdout
+  <template>
+    output_type ltsv
+  </template>
+</match>

data/fluent-plugin-forest.gemspec

@@ -1,13 +1,13 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-forest"
-  gem.version       = "0.3.0"
+  gem.version       = "0.3.1"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.description   = %q{create sub-plugin dynamically per tags, with template configuration and parameters}
   gem.summary       = %q{plugin to create output plugin instances per tags dynamically}
   gem.homepage      = "https://github.com/tagomoris/fluent-plugin-forest"
-  gem.license       = "APLv2"
+  gem.license       = "Apache-2.0"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -15,5 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "test-unit", "~> 3.1.7"
   gem.add_runtime_dependency "fluentd"
 end

data/lib/fluent/plugin/out_forest.rb

@@ -141,7 +141,7 @@ class Fluent::ForestOutput < Fluent::MultiOutput
       log.error e.backtrace.join("\n")
       log.error "Cannot output messages with tag '#{tag}'"
       output = nil
-    rescue StandardError => e
+    rescue StandardError, ScriptError => 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}'"
@@ -168,7 +168,11 @@ class Fluent::ForestOutput < Fluent::MultiOutput
       output = plant(tag)
     end
     if output
-      output.emit(tag, es, chain)
+      if output.respond_to?(:emit_events)
+        output.emit_events(tag, es)
+      else
+        output.emit(tag, es, chain)
+      end
     else
       chain.next
     end

data/test/output/out_forest_test.rb

@@ -36,7 +36,7 @@ class Fluent::ForestTestOutput < Fluent::Output
       if @tagfield
         r[@tagfield] = tag
       end
-      Fluent::Engine.emit(@tag, time, r)
+      router.emit(@tag, time, r)
     }
     chain.next
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-forest
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-10 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.7
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- example/sample.conf
 - fluent-plugin-forest.gemspec
 - lib/fluent/plugin/out_forest.rb
 - test/helper.rb
@@ -60,7 +75,7 @@ files:
 - test/plugin/test_out_forest_test.rb
 homepage: https://github.com/tagomoris/fluent-plugin-forest
 licenses:
-- APLv2
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -78,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: plugin to create output plugin instances per tags dynamically