fluent-plugin-keep-forward 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbe4023150376fbaded20b1341adb19c3d7c65c7
-  data.tar.gz: cc46d27569ff273e64ac0436402811bfe20c134f
+  metadata.gz: dbbee68f0007b1260a98d7daa5f5c5cc948dae3c
+  data.tar.gz: 29e55d39b2ac8c062e896a4f52a55c7c98879165
 SHA512:
-  metadata.gz: 931eeec156abc448a06edc8c23aa665bcdacee8ea01d2cc31f3c55a46bcd11b5623425dc3c8c48b00048696fcb5450beb5e4de045a6d4c2538d5d4f96bd3fa22
-  data.tar.gz: 935f93bd171edc9aa7ea2f895f5f8ad8f01cc3de3e8990d4be12c022a8797aadae12a434d2b08f30625ecde2d5bcdcab7787876d8bc0d27e6a01a75a33162f99
+  metadata.gz: e5feef720bd183dff7b0abcb778246d4176700f94aee5520f519a19211c9783161977822943fc76f340f3fc18e9d0ebb1a8d8cefd106f0ab123c7d46b8c99862
+  data.tar.gz: 5d955251c44825f448be0d9fb969b58ed7c2b1611367cc5b01591e8af176b7c22066fa16e6fc072d6345a6413248b11128300441a85dcc405cf5f847d1d022b1

data/README.md

@@ -8,16 +8,13 @@ This is an extension of fluentd out\_forward plugin to keep fowarding log data t
 
 ## Configuration
 
-Exactly same with out\_forward plugin. See http://docs.fluentd.org/articles/out_forward
+Basically same with out\_forward plugin. See http://docs.fluentd.org/articles/out_forward
 
-## Log
+## Additional Parameters
 
-This plugin outputs log messages like
+* prefer_recover
 
-    $ grep 'keep forwarding' /var/log/td-agent/td-agent.log
-    2013-03-15 10:35:06 +0900: keep forwarding tag 'fluent.info' to node 'localhost:24224' host="localhost" port=24224 weight=60
-
-You can tell the address of current forwarding node easily. 
+    Switch to a recovered node from standby nodes or less weighted nodes. Default is `true`.
 
 ## Contributing
 

data/fluent-plugin-keep-forward.gemspec

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

data/lib/fluent/plugin/out_keep_forward.rb

@@ -3,9 +3,11 @@ require 'fluent/plugin/out_forward'
 class Fluent::KeepForwardOutput < Fluent::ForwardOutput
   Fluent::Plugin.register_output('keep_forward', self)
 
+  config_param :prefer_recover, :bool, :default => true
+
   def write_objects(tag, es)
     @node ||= {}
-    if @node[tag] and @node[tag].available? # and @weight_array.include?(@node[tag])
+    if @node[tag] and @node[tag].available? and (!@prefer_recover or @weight_array.include?(@node[tag]))
       begin
         send_data(@node[tag], tag, es)
         return

data/spec/out_keep_forward_spec.rb

@@ -15,7 +15,8 @@ shared_context 'keep_forward_init' do
   ]
   let(:tag) { 'syslog.host1' }
   let(:es)  { Object.new }
-  let(:driver) { Fluent::Test::OutputTestDriver.new(Fluent::KeepForwardOutput, tag).configure(CONFIG).instance }
+  let(:config) { CONFIG }
+  let(:driver) { Fluent::Test::OutputTestDriver.new(Fluent::KeepForwardOutput, tag).configure(config).instance }
 end
 
 shared_context 'keep_forward_try_once' do
@@ -49,11 +50,30 @@ describe Fluent::KeepForwardOutput do
     it { driver.write_objects(tag, es) }
   end
 
-  describe 'switch if not included in weight_array?' do
-    before { driver.instance_variable_set(:@weight_array, [unkeep_node]) }
+  describe 'not included in weight_array?' do
+    context "switch if recover true" do
+      let(:config) {
+        CONFIG + %[
+          prefer_recover true
+        ]
+      }
+      before { driver.instance_variable_set(:@weight_array, [unkeep_node]) }
 
-    let(:target) { unkeep_node }
-    it { driver.write_objects(tag, es) }
+      let(:target) { unkeep_node }
+      it { driver.write_objects(tag, es) }
+    end
+
+    context "not switch if recorver false" do
+      let(:config) {
+        CONFIG + %[
+          prefer_recover false
+        ]
+      }
+      before { driver.instance_variable_set(:@weight_array, [unkeep_node]) }
+
+      let(:target) { keep_node }
+      it { driver.write_objects(tag, es) }
+    end
   end
 
   describe 'switch if send_data to keep_node raises?' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-keep-forward
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Naotoshi SEO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd