fluent-plugin-yohoushi 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a49f24e3f8a74c0b5c310d238ed10710532c7317
-  data.tar.gz: 6dba30cb2b7d0e4adcb1c0b41692622bc94527c5
+  metadata.gz: b5ca313fd0763679536353b8ea54dd0cacc01c1f
+  data.tar.gz: 7399aa2381f7ce696d6f76f8e60358b00167ed2b
 SHA512:
-  metadata.gz: 207e2fc941c229683499d4734bf1672b71004396c157063e05e9c1142fa429cc10b5e6fa9f501241e60f55c55aab2c803610cc04a9da269ff0c47805901c7e42
-  data.tar.gz: 0c003a78f32b67258bfb68d43367cb297ba51a86964d44e407c3c76f26d81a26a9a9a355c1ede96cae43a0334292d4d5f20dd356ff25e567f3a981affb477b28
+  metadata.gz: 8359f7a3e43446fb0b917db7d5e59629b8b3acd2cec937d5bf13a4becd81e418d3dec5de2c5eea4282131887ce7639df3e3d6a615684476c59d62a10a63b6bb3
+  data.tar.gz: a07612a0d7927c3eeabb532f0271c5531e240067d830b80f7b5f4c8f36798b49a0ae777443341aab70a45a3b427407c8f6624322b1679f1128fe4a9082ba2bd9

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.2 (2014/02/03)
+
+Fixes:
+
+* Revert background post. I met troubles that fluentd process does not die.
+
 ## 0.1.1 (2014/01/29)
 
 Enhancement:
@@ -8,7 +14,7 @@ Enhancement:
 
 Changes:
 
-* fluent-plugin-yohoushi is now a buffer plugin
+* fluent-plugin-yohoushi is now a buffered plugin, it will post in background
 
 ## 0.0.5 (2014/01/25)
 

data/fluent-plugin-yohoushi.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-yohoushi"
-  s.version     = "0.1.1"
+  s.version     = "0.1.2"
   s.authors     = ["Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-yohoushi"
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "fluentd"
+  s.add_runtime_dependency "growthforecast-client", ">= 0.62.4"
   s.add_runtime_dependency "multiforecast-client"
   s.add_runtime_dependency "yohoushi-client"
 

data/lib/fluent/plugin/out_yohoushi.rb

@@ -1,5 +1,5 @@
 module Fluent
-  class YohoushiOutput < BufferedOutput
+  class YohoushiOutput < Output
     Plugin.register_output('yohoushi', self)
 
     MAPPING_MAX_NUM = 20
@@ -32,17 +32,6 @@ module Fluent
       end
     end
     config_param :enable_ruby, :bool, :default => true # true for lower version compatibility
-
-    # Override default parameters of Bufferedoutput options
-    config_param :buffer_type, :string, :default => 'memory'
-    config_param :flush_interval, :time, :default => 0 # we can not wait 1 minute to create 1 minute graphs (originally, 60)
-    config_param :try_flush_interval, :float, :default => 1 # we would be able to shorten more
-    config_param :retry_limit, :integer, :default => 0 # growthforecast requires a realtime post, so do not retry (originally, 17)
-    config_param :retry_wait, :time, :default => 1.0
-    config_param :max_retry_wait, :time, :default => nil
-    config_param :num_threads, :integer, :default => 1
-    config_param :queued_chunk_flush_interval, :time, :default => 1
-
     # for test
     attr_reader :client
     attr_reader :mapping
@@ -64,6 +53,11 @@ module Fluent
           @mapping[from] = to
         end
         @client = MultiForecast::Client.new('mapping' => @mapping) unless @mapping.empty?
+        @client.clients.each { |c|
+          c.connect_timeout = 5.0
+          c.send_timeout = 5.0
+          c.receive_timeout = 5.0
+        }
       end
       raise ConfigError, "Either of `base_uri` or `mapping1` must be specified" unless @client
 
@@ -116,31 +110,29 @@ module Fluent
       $log.warn "out_yohoushi: #{e.class} #{e.message} #{path} #{e.backtrace.first}"
     end
 
-    def format(tag, time, record)
-      [tag, time, record].to_msgpack
-    end
-
-    def write(chunk)
-      chunk.msgpack_each do |tag, time, record|
-        tag_parts = tag.split('.')
-        tag_prefix = tag_prefix(tag_parts)
-        tag_suffix = tag_suffix(tag_parts)
-        placeholders = {
-          'tag' => tag,
-          'tags' => tag_parts, # for lower compatibility
-          'tag_parts' => tag_parts,
-          'tag_prefix' => tag_prefix,
-          'tag_suffix' => tag_suffix,
-          'hostname' => @hostname,
-        }
-        if @key_pattern
+    def emit(tag, es, chain)
+      tag_parts = tag.split('.')
+      tag_prefix = tag_prefix(tag_parts)
+      tag_suffix = tag_suffix(tag_parts)
+      placeholders = {
+        'tag' => tag,
+        'tags' => tag_parts, # for lower compatibility
+        'tag_parts' => tag_parts,
+        'tag_prefix' => tag_prefix,
+        'tag_suffix' => tag_suffix,
+        'hostname' => @hostname,
+      }
+      if @key_pattern
+        es.each do |time, record|
           record.each do |key, value|
             next unless key =~ @key_pattern
             placeholders['key'] = key
             path = expand_placeholder(@key_pattern_path, time, record, placeholders)
             post(path, value)
           end
-        else # keys
+        end
+      else # keys
+        es.each do |time, record|
           @keys.each do |key, path|
             next unless value = record[key]
             placeholders['key'] = key
@@ -149,9 +141,10 @@ module Fluent
           end
         end
       end
+
+      chain.next
     rescue => e
       $log.warn "out_yohoushi: #{e.class} #{e.message} #{e.backtrace.first}"
-      # Here, no raise of an error, so this BufferedOutput does not retry
     end
 
     def expand_placeholder(value, time, record, opts)

data/spec/out_yohoushi_spec.rb

@@ -19,7 +19,7 @@ describe Fluent::YohoushiOutput do
   let(:yohoushi_base_uri) { 'http://localhost:4804' }
   let(:growthforecast_base_uri) { 'http://localhost:5125' }
   let(:tag) { 'test' }
-  let(:driver) { Fluent::Test::BufferedOutputTestDriver.new(Fluent::YohoushiOutput, tag).configure(config) }
+  let(:driver) { Fluent::Test::OutputTestDriver.new(Fluent::YohoushiOutput, tag).configure(config) }
   let(:instance) { driver.instance }
 
   describe 'test configure' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-yohoushi
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: growthforecast-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.62.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.62.4
 - !ruby/object:Gem::Dependency
   name: multiforecast-client
   requirement: !ruby/object:Gem::Requirement