fluent-plugin-secure-forward 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36c52311efac9f5299e788cd59528b6b219235e1
-  data.tar.gz: 9bb3d35a955fb318be671af1a56699deb2ba48fc
+  metadata.gz: b7537e28e4132ab67a0c349d00c5d9cc6b8ceec9
+  data.tar.gz: 0bee32d156d2790eab7f7b6ecc68dc6f140acd05
 SHA512:
-  metadata.gz: 698ac45cf88865ba4246be9bd7bba7d61bf09f604f637874a9c012b861a6d42ae1b04c5d4fe365f08c3ca2175b1e6cae231ca19cd96b9af799604ed4ae22d088
-  data.tar.gz: a455211d078fd04730d4d7422c538f3fde4e7da8f39915580905a359c71fc3ba0b7a15090f73e840e374efd7612443cd998aeab0b7028ab098601c7a24cf6d3e
+  metadata.gz: 718b3c7931428afca8784c41e572e7260108e8ab51ddf224b4bf2648031b00ac498ee2f2e7a6468d057f5c04047cd2752c96606b5dafab43e5a250af4c88a389
+  data.tar.gz: 6894e962c4baf8eb3f1de6dc26aa0fbc2c199f91b3905dca998dce6c56c6f69548a3cc60c62eb55350a8eba8a1987ec926335aa8a8b3c34dbe0f5211780f18ab

data/README.md

@@ -124,7 +124,7 @@ Minimal configurations like this:
       </server>
     </match>
 
-When specified 2 or more `<server>`, this plugin uses these nodes in simple round-robin order.
+When specified 2 or more `<server>`, this plugin uses these nodes in simple round-robin order. And servers with `standby yes` will be selected until all of non-standby servers goes down.
 
 If server requires username/password, set `username` and `password` in `<server>` section:
 
@@ -142,6 +142,12 @@ If server requires username/password, set `username` and `password` in `<server>
         username sasatatsu
         password karaage
       </server>
+      <server>
+        host standby.fqdn.local
+        username kzk
+        password hawaii
+        standby  yes
+      </server>
     </match>
 
 To specify keepalive timeouts, use `keepalive` configuration with seconds. SSL connection will be disconnected and re-connected for each 1 hour with configuration below. In Default (and with `keepalive 0`), connections will not be disconnected without any communication troubles. (This feature is for dns name updates, and SSL common key refreshing.)

data/example/client.conf

@@ -9,12 +9,14 @@
   keepalive 30
   <server>
     host localhost
+    standby
   </server>
   <server>
     host localhost
+    standby yes
   </server>
   <server>
-    host localhost
+    host localhost2
   </server>
   flush_interval 1s
 </match>

data/fluent-plugin-secure-forward.gemspec

@@ -1,11 +1,11 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-secure-forward"
-  gem.version       = "0.1.0"
+  gem.version       = "0.1.1"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.summary       = %q{Fluentd input/output plugin to forward over SSL with authentications}
-  gem.description   = %q{This version is HIGHLY EXPERIMENTAL.}
+  gem.description   = %q{Testing version}
   gem.homepage      = "https://github.com/tagomoris/fluent-plugin-secure-forward"
 
   gem.files         = `git ls-files`.split($\)

data/lib/fluent/plugin/out_secure_forward.rb

@@ -92,7 +92,7 @@ module Fluent
       true
     end
 
-    def select_node
+    def select_node(permit_standby=false)
       tries = 0
       nodes = @nodes.size
       @mutex.synchronize {
@@ -102,7 +102,7 @@ module Fluent
           @next_node += 1
           @next_node = 0 if @next_node >= nodes
 
-          return n if n && n.established?
+          return n if n && n.established? && (!n.standby || permit_standby)
 
           tries += 1
         end
@@ -164,10 +164,11 @@ module Fluent
 
     def write_objects(tag, es)
       #TODO: check errors
-      node = select_node
+      node = select_node || select_node(true)
       unless node
         raise "no one nodes with valid ssl session"
       end
+      $log.trace "selected node", :host => node.host, :port => node.port, :standby => node.standby
 
       begin
         send_data(node, tag, es)

data/lib/fluent/plugin/output_node.rb

@@ -7,7 +7,8 @@
 require_relative 'openssl_util'
 
 class Fluent::SecureForwardOutput::Node
-  attr_accessor :host, :port, :hostlabel, :shared_key, :username, :password
+  attr_accessor :host, :port, :hostlabel, :shared_key, :username, :password, :standby
+
   attr_accessor :authentication, :keepalive
   attr_accessor :socket, :sslsession, :unpacker, :shared_key_salt, :state
 
@@ -24,6 +25,7 @@ class Fluent::SecureForwardOutput::Node
     @hostlabel = conf['hostlabel'] || conf['host']
     @username = conf['username'] || ''
     @password = conf['password'] || ''
+    @standby = conf.has_key?('standby') && Fluent::Config.bool_value(conf['standby']) != false
 
     @authentication = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-secure-forward
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - TAGOMORI Satoshi
@@ -66,7 +66,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: This version is HIGHLY EXPERIMENTAL.
+description: Testing version
 email:
 - tagomoris@gmail.com
 executables: []