fluent-plugin-secure-forward 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e700036f456a8cb24ccf0ac3da1fec0a4399f8c1
-  data.tar.gz: 605aaac75253af05071ae9b1083c2ef9b9f9c183
+  metadata.gz: 8af5d60c64844af10a3b696b82575ea1fe454ca4
+  data.tar.gz: 2b2233c78c7ed1e3719739164509d81170f96729
 SHA512:
-  metadata.gz: 9fae9e2ebb590fdd6f3851e340561e77f2b6b9327ed8c8f12d936ea3117fd64f3efd6c99d0c9b86e507b9bcabf95f379b87b2cd41d3b244278d54499fe793c07
-  data.tar.gz: 0d09b52464da3a83376eea7dcf64dd83fc578d5c8165fe46edcca29fe68860241dd33637fff523e5ae48907036d6027582620df0e9f4fe2dea94986c3bb263da
+  metadata.gz: 3fb1d89761e7732a110d0c1b539645b382585adda84c69922f1a28fee51d98e7e02671bfa13c7a63d8ef697c9c87df24b0833ef3fe8bfa90eb1dfdfc78441d7d
+  data.tar.gz: 5637f5af9ea6b56eea5f125e3ce14d03f684620974560898ca3d0446b2510485bd71ae1869b9d8d8ca98614460bcdcfccd5f9a8a47e0c66fde09eb5230b0ffde

data/README.md

@@ -1,6 +1,6 @@
 # fluent-plugin-secure-forward
 
-Fluentd input/output plugin to forward fluentd messages over SSL with authentication.
+[Fluentd](http://fluentd.org) input/output plugin to forward fluentd messages over SSL with authentication.
 
 This plugin makes you to be able to:
 

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.1.6"
+  gem.version       = "0.1.7"
   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/in_secure_forward.rb

@@ -69,6 +69,11 @@ module Fluent
       require 'digest'
     end
 
+    # Define `log` method for v0.10.42 or earlier
+    unless method_defined?(:log)
+      define_method("log") { $log }
+    end
+
     def configure(conf)
       super
 
@@ -165,22 +170,22 @@ module Fluent
     end
 
     def run # sslsocket server thread
-      $log.trace "setup for ssl sessions"
+      log.trace "setup for ssl sessions"
       cert, key = self.certificate
       ctx = OpenSSL::SSL::SSLContext.new
       ctx.cert = cert
       ctx.key = key
 
-      $log.trace "start to listen", :bind => @bind, :port => @port
+      log.trace "start to listen", :bind => @bind, :port => @port
       server = TCPServer.new(@bind, @port)
-      $log.trace "starting SSL server", :bind => @bind, :port => @port
+      log.trace "starting SSL server", :bind => @bind, :port => @port
       @sock = OpenSSL::SSL::SSLServer.new(server, ctx)
       @sock.start_immediately = false
       begin
-        $log.trace "accepting sessions"
+        log.trace "accepting sessions"
         loop do
           while socket = @sock.accept
-            $log.trace "accept tcp connection (ssl session not established yet)"
+            log.trace "accept tcp connection (ssl session not established yet)"
             @sessions.push Session.new(self, socket)
           end
         end

data/lib/fluent/plugin/out_secure_forward.rb

@@ -57,6 +57,11 @@ module Fluent
       require 'resolve/hostname'
     end
 
+    # Define `log` method for v0.10.42 or earlier
+    unless method_defined?(:log)
+      define_method("log") { $log }
+    end
+
     def configure(conf)
       super
 
@@ -113,11 +118,11 @@ module Fluent
     def start
       super
 
-      $log.debug "starting secure-forward"
+      log.debug "starting secure-forward"
       OpenSSL::Random.seed(File.read("/dev/urandom", 16))
-      $log.debug "start to connect target nodes"
+      log.debug "start to connect target nodes"
       @nodes.each do |node|
-        $log.debug "connecting node", :host => node.host, :port => node.port
+        log.debug "connecting node", :host => node.host, :port => node.port
         node.start
       end
       @nodewatcher = Thread.new(&method(:node_watcher))
@@ -127,24 +132,24 @@ module Fluent
       loop do
         sleep @reconnect_interval
 
-        $log.trace "in node health watcher"
+        log.trace "in node health watcher"
 
         (0...(@nodes.size)).each do |i|
-          $log.trace "node health watcher for #{@nodes[i].host}"
+          log.trace "node health watcher for #{@nodes[i].host}"
 
           next if @nodes[i].established? && ! @nodes[i].expired?
 
-          $log.info "dead connection found: #{@nodes[i].host}, reconnecting..." unless @nodes[i].established?
+          log.info "dead connection found: #{@nodes[i].host}, reconnecting..." unless @nodes[i].established?
 
           node = @nodes[i]
-          $log.debug "reconnecting to node", :host => node.host, :port => node.port, :expire => node.expire, :expired => node.expired?
+          log.debug "reconnecting to node", :host => node.host, :port => node.port, :expire => node.expire, :expired => node.expired?
 
           @nodes[i] = node.dup
           @nodes[i].start
           begin
             node.shutdown
           rescue => e
-            $log.warn "error in shutdown of dead connection", :error_class => e.class, :error => e
+            log.warn "error in shutdown of dead connection", :error_class => e.class, :error => e
           end
         end
       end
@@ -167,12 +172,12 @@ module Fluent
       unless node
         raise "no one nodes with valid ssl session"
       end
-      $log.trace "selected node", :host => node.host, :port => node.port, :standby => node.standby
+      log.trace "selected node", :host => node.host, :port => node.port, :standby => node.standby
 
       begin
         send_data(node, tag, es)
       rescue Errno::EPIPE, IOError, OpenSSL::SSL::SSLError => e
-        $log.warn "Failed to send messages to #{node.host}, parging.", :error_class => e.class, :error => e
+        log.warn "Failed to send messages to #{node.host}, parging.", :error_class => e.class, :error => e
         begin
           node.shutdown
         rescue => e2

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-secure-forward
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fluent-mixin-config-placeholders
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: resolve-hostname
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Message forwarding over SSL with authentication
@@ -73,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -106,17 +106,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Fluentd input/output plugin to forward over SSL with authentications
@@ -124,4 +124,3 @@ test_files:
 - test/helper.rb
 - test/plugin/test_in_secure_forward.rb
 - test/plugin/test_out_secure_forward.rb
-has_rdoc: