fluent-plugin-secure-forward 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca2356a052a35ccb1ce9a6e1e06aefdaaf58fd37
-  data.tar.gz: 3733590e3818bbbdbc7f92a11a609639e0d19fca
+  metadata.gz: 6b0eb8491c4513104e1db78902eac9cfa5a4c28e
+  data.tar.gz: 903b7d2ca23e3ed23a6843475a2f0de546e59656
 SHA512:
-  metadata.gz: b2f8f19e8550dec4e7b9eff6ec47b030ae5d77e04fc0cbeabc39ff42ba865382839359bb3bf648120c388cfce0357b767b9b767887a336491042e1233095f355
-  data.tar.gz: e41959d32c7370796154763a0d8314270255f02d738ed3a1f8253f6f7555dc5b6b17040fd4c5aaf99ae82f3fc6b833491f0962c188bb7752355093289d59004e
+  metadata.gz: 27b2fb512c94a613c12300befce152fb4511ffcea9970ef8d32c33327b34923fbed585d43b3e2fad5322f2262a4af1833180815daeece2e0507c75fd6e828a99
+  data.tar.gz: 58dab1197ea8bf022d1f0dcce7858a0574d55781bac15ec8186c7f95e88950733160cd679c4ec928898104b32e2ab78c118df224f111857e618aeb5623e65706

data/fluent-plugin-secure-forward.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-secure-forward"
-  gem.version       = "0.2.0"
+  gem.version       = "0.2.1"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.summary       = %q{Fluentd input/output plugin to forward over SSL with authentications}

data/lib/fluent/plugin/out_secure_forward.rb

@@ -129,17 +129,19 @@ module Fluent
         node.start
       end
       @nodewatcher = Thread.new(&method(:node_watcher))
+      @nodewatcher.abort_on_exception = true
     end
 
     def node_watcher
       reconnectings = Array.new(@nodes.size)
+      nodes_size = @nodes.size
 
       loop do
         sleep @reconnect_interval
 
         log.trace "in node health watcher"
 
-        (0...(@nodes.size)).each do |i|
+        (0...nodes_size).each do |i|
           log.trace "node health watcher for #{@nodes[i].host}"
 
           next if @nodes[i].established? && ! @nodes[i].expired?
@@ -152,26 +154,24 @@ module Fluent
           log.debug "reconnecting to node", :host => node.host, :port => node.port, :expire => node.expire, :expired => node.expired?
 
           renewed = node.dup
-          begin
-            renewed.start
-            Thread.pass # to connection thread
-            reconnectings[i] = { :conn => renewed, :at => Time.now }
-          rescue => e
-            log.debug "Some error occured on start of renewed connection", :error_class => e2.class, :error => e2, :host => renewed.host, :port => renewed.port
-          end
+          renewed.start
+
+          Thread.pass # to connection thread
+          reconnectings[i] = { :conn => renewed, :at => Time.now }
         end
 
-        (0...(reconnectings.size)).each do |i|
+        (0...nodes_size).each do |i|
           next unless reconnectings[i]
 
+          log.trace "checking reconnecting node #{reconnectings[i][:conn].host}"
+
           if reconnectings[i][:conn].established?
+            log.debug "connection established for reconnecting node"
             oldconn = @nodes[i]
             @nodes[i] = reconnectings[i][:conn]
-            begin
-              oldconn.shutdown
-            rescue => e
-              log.debug "Some error occured on shutdown of expired connection", :error_class => e.class, :error => e, :host => renewed.host, :port => renewed.port
-            end
+            log.trace "old connection shutting down"
+            oldconn.shutdown if oldconn # connection object doesn't raise any exceptions
+            log.trace "old connection shutted down"
 
             reconnectings[i] = nil
             next
@@ -179,17 +179,13 @@ module Fluent
 
           # not connected yet
 
-          next if reconnectings[i][:at] < Time.now + @established_timeout
+          next if reconnectings[i][:at] + @established_timeout > Time.now
 
           # not connected yet, and timeout
-          begin
-            timeout_conn = reconnectings[i][:conn]
-            log.debug "SSL connection is not established until timemout", :host => timeout_conn.host, :port => timeout_conn.port, :timeout => @established_timeout
-            reconnectings[i] = nil
-            timeout_conn.shutdown
-          rescue => e
-            log.debug "Some error occured on shutdown of timeout re-connection", :error_class => e.class, :error => e
-          end
+          timeout_conn = reconnectings[i][:conn]
+          log.debug "SSL connection is not established until timemout", :host => timeout_conn.host, :port => timeout_conn.port, :timeout => @established_timeout
+          reconnectings[i] = nil
+          timeout_conn.shutdown if timeout_conn # connection object doesn't raise any exceptions
         end
       end
     end

data/lib/fluent/plugin/output_node.rb

@@ -59,6 +59,8 @@ class Fluent::SecureForwardOutput::Node
 
   def start
     @thread = Thread.new(&method(:connect))
+    ## If you want to check code bug, turn this line enable
+    # @thread.abort_on_exception = true
   end
 
   def shutdown
@@ -189,7 +191,13 @@ class Fluent::SecureForwardOutput::Node
 
     addr = @sender.hostname_resolver.getaddress(@host)
     log.debug "create tcp socket to node", :host => @host, :address => addr, :port => @port
-    sock = TCPSocket.new(addr, @port)
+    begin
+      sock = TCPSocket.new(addr, @port)
+    rescue => e
+      log.warn "failed to connect for secure-forward", :error_class => e.class, :error => e, :host => @host, :address => addr, :port => @port
+      @state = :failed
+      return
+    end
 
     log.trace "changing socket options"
     opt = [1, @sender.send_timeout.to_i].pack('I!I!')  # { int l_onoff; int l_linger; }
@@ -204,10 +212,18 @@ class Fluent::SecureForwardOutput::Node
     # TODO: context.ca_file = (ca_file_path)
     # TODO: context.ciphers = (SSL Shared key chiper protocols)
 
-    log.debug "trying to connect ssl session", :host => @host, :ipaddr => addr, :port => @port
-    sslsession = OpenSSL::SSL::SSLSocket.new(sock, context)
-    # TODO: check connection failure
-    sslsession.connect
+    log.debug "trying to connect ssl session", :host => @host, :address => addr, :port => @port
+    begin
+      sslsession = OpenSSL::SSL::SSLSocket.new(sock, context)
+    rescue => e
+      log.warn "failed to establish SSL connection", :host => @host, :address => addr, :port => @port
+    end
+
+    unless sslsession.connect
+      log.debug "failed to connect", :host => @host, :address => addr, :port => @port
+      @state = :failed
+      return
+    end
     log.debug "ssl session connected", :host => @host, :port => @port
 
     begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-secure-forward
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -126,4 +126,3 @@ test_files:
 - test/plugin/test_in_secure_forward.rb
 - test/plugin/test_input_session.rb
 - test/plugin/test_out_secure_forward.rb
-has_rdoc: