fluent-plugin-syslog_rfc5424 0.7.2 → 0.7.3.pre.rc.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7e904557320502d2ad3c0ef6e191f86d975db51e
-  data.tar.gz: 108731169366146f496c5fde50e48d732f3e5754
+SHA256:
+  metadata.gz: 3aeba1bc85d4277e29e9eab6f55f3356d622d366e761fe6d2e4a09e6fd6357b5
+  data.tar.gz: 472056538a630900856e091898b30806de2f574d5ff60fb600705a871192d016
 SHA512:
-  metadata.gz: d833f7032c2c86b22e9b6dac5655af28f80f2a346c4c2a051b6af5150c6e80dfa82d3314aaebc630e364da87f59c778979ed7f2bc77a4fe6b1bb1abebde27dec
-  data.tar.gz: a11a9ad57de818c8bba185070f838b8ed24646e6650e242f880e08e7745239728ac5643328ef673688fd2a9c4614208bf72f5e25bdd896d8443627233e749b57
+  metadata.gz: b5c87c426d6495f62d79b78b378e2fe3e5f707e8324dd47715acee634c2a29eac7c3ebf97d51b254dcb9f59bc5bebdfd0244c6b1730f02f764f913d2c2e6c094
+  data.tar.gz: 0cf85fdc27458d40b65f049e0b32bcccf3cafad67b765d3717bf09b8e79f5fc0738d3682ef47fd88c12d91434c2643e6f206378d892bb35842ceb9b67b972115

data/fluent-plugin-syslog_rfc5424.gemspec

@@ -1,10 +1,10 @@
 
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
+require 'fluent-plugin-syslog_rfc5424/version'
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-syslog_rfc5424"
-  spec.version       = "0.7.2"
+  spec.version       = FluentSyslog5424OutputPlugin::VERSION
   spec.authors       = ["Pivotal"]
   spec.email         = %w(cf-loggregator@pivotal.io)
   spec.homepage      = "https://github.com/cloudfoundry/fluent-plugin-syslog_rfc5424"
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "test-unit", "~> 3.3"
   spec.add_development_dependency "test-unit-rr", "~> 1.0"
   spec.add_development_dependency "pry", "~> 0.12"
-  spec.add_development_dependency "minitest", "~> 5.8"
+  spec.add_development_dependency "minitest", "~> 5.14"
 
   spec.add_runtime_dependency "fluentd", "~> 1.7"
 end

data/lib/fluent/plugin/formatter_syslog_rfc5424.rb

@@ -16,9 +16,6 @@ module Fluent
       end
 
       def format(tag, time, record)
-        log.debug("Tag")
-        log.debug(tag.to_s)
-
         log.debug("Record")
         log.debug(record.map { |k, v| "#{k}=#{v}" }.join('&'))
 

data/lib/fluent/plugin/out_syslog_rfc5424.rb

@@ -28,9 +28,11 @@ module Fluent
         tag = chunk.metadata.tag
         chunk.each do |time, record|
           begin
-            socket.write @formatter.format(tag, time, record)
-          rescue
-            @sockets[socket_key(@transport.to_sym, @host, @port)] = nil
+            socket.write_nonblock @formatter.format(tag, time, record)
+            IO.select(nil, [socket], nil, 1) || raise(StandardError.new "ReconnectError")
+          rescue => e
+            @sockets.delete(socket_key(@transport.to_sym, @host, @port))
+            socket.close
             raise
           end
         end
@@ -54,7 +56,8 @@ module Fluent
       def socket_options
         return {} unless @transport == 'tls'
 
-        { insecure: @insecure, verify_fqdn: !@insecure, cert_paths: @trusted_ca_path }
+        # TODO: make timeouts configurable
+        { insecure: @insecure, verify_fqdn: !@insecure, cert_paths: @trusted_ca_path } #, connect_timeout: 1, send_timeout: 1, recv_timeout: 1, linger_timeout: 1 } 
       end
 
       def socket_key(transport, host, port)

data/lib/fluent-plugin-syslog_rfc5424/version.rb

@@ -0,0 +1,3 @@
+module FluentSyslog5424OutputPlugin
+  VERSION = "0.7.3-rc.11"
+end

data/test/plugin/out_syslog_rfc5424_spec.rb

@@ -30,10 +30,12 @@ class OutSyslogRFC5424Test < Test::Unit::TestCase
       port 123
     )
 
-    socket = Minitest::Mock.new
-    mock(socket).write(@formatted_log)
+    socket = Object.new
+    mock(socket).write_nonblock(@formatted_log)
     stub(socket).close
 
+    stub(IO).select(nil, [socket], nil, 1) { ["not an error"] }
+    
     any_instance_of(Fluent::Plugin::OutSyslogRFC5424) do |fluent_plugin|
       mock(fluent_plugin).socket_create(:tls, "example.com", 123, {:insecure=>false, :verify_fqdn=>true, :cert_paths=>nil}).returns(socket)
     end
@@ -50,17 +52,17 @@ class OutSyslogRFC5424Test < Test::Unit::TestCase
       port 123
     )
 
-    bad_socket = Minitest::Mock.new
-    mock(bad_socket).write(@formatted_log) {
-      raise StandardError
-    }
+    bad_socket = Object.new
+    mock(bad_socket).write_nonblock(@formatted_log)
     stub(bad_socket).close
-
-
-    good_socket = Minitest::Mock.new
-    mock(good_socket).write(@formatted_log)
+    
+    good_socket = Object.new
+    mock(good_socket).write_nonblock(@formatted_log)
     stub(good_socket).close
 
+    mock(IO).select(nil, [bad_socket], nil, 1)
+    mock(IO).select(nil, [good_socket], nil, 1) { ["not an error"] }
+
     any_instance_of(Fluent::Plugin::OutSyslogRFC5424) do |fluent_plugin|
       mock(fluent_plugin).socket_create(:tls, "example.com", 123, {:insecure=>false, :verify_fqdn=>true, :cert_paths=>nil}).returns(bad_socket)
       mock(fluent_plugin).socket_create(:tls, "example.com", 123, {:insecure=>false, :verify_fqdn=>true, :cert_paths=>nil}).returns(good_socket)
@@ -79,10 +81,12 @@ class OutSyslogRFC5424Test < Test::Unit::TestCase
       transport tcp
     )
 
-    socket = Minitest::Mock.new
-    mock(socket).write(@formatted_log)
+    socket = Object.new
+    mock(socket).write_nonblock(@formatted_log)
     stub(socket).close
 
+    stub(IO).select(nil, [socket], nil, 1) { ["not an error"] }
+
     any_instance_of(Fluent::Plugin::OutSyslogRFC5424) do |fluent_plugin|
       mock(fluent_plugin).socket_create(:tcp, "example.com", 123, {}).returns(socket)
     end
@@ -101,10 +105,12 @@ class OutSyslogRFC5424Test < Test::Unit::TestCase
       insecure true
     )
 
-    socket = Minitest::Mock.new
-    mock(socket).write(@formatted_log)
+    socket = Object.new
+    mock(socket).write_nonblock(@formatted_log)
     stub(socket).close
 
+    stub(IO).select(nil, [socket], nil, 1) { ["not an error"] }
+
     any_instance_of(Fluent::Plugin::OutSyslogRFC5424) do |fluent_plugin|
       mock(fluent_plugin).socket_create(:tls, "example.com", 123, {:insecure=>true, :verify_fqdn=>false, :cert_paths=>nil}).returns(socket)
     end
@@ -123,10 +129,12 @@ class OutSyslogRFC5424Test < Test::Unit::TestCase
       trusted_ca_path supertrustworthy
     )
 
-    socket = Minitest::Mock.new
-    mock(socket).write(@formatted_log)
+    socket = Object.new
+    mock(socket).write_nonblock(@formatted_log)
     stub(socket).close
 
+    stub(IO).select(nil, [socket], nil, 1) { ["not an error"] }
+
     any_instance_of(Fluent::Plugin::OutSyslogRFC5424) do |fluent_plugin|
       mock(fluent_plugin).socket_create(:tls, "example.com", 123, {:insecure=>false, :verify_fqdn=>true, :cert_paths=>"supertrustworthy"}).returns(socket)
     end
@@ -143,14 +151,16 @@ class OutSyslogRFC5424Test < Test::Unit::TestCase
       port 123
     )
 
-    socket = Minitest::Mock.new
-    stub(socket).write(@formatted_log)
+    socket = Object.new
+    stub(socket).write_nonblock(@formatted_log)
+    mock(socket).close
+
+    stub(IO).select(nil, [socket], nil, 1) { ["not an error"] }
 
     any_instance_of(Fluent::Plugin::OutSyslogRFC5424) do |fluent_plugin|
       mock(fluent_plugin).socket_create(:tls, "example.com", 123, {:insecure=>false, :verify_fqdn=>true, :cert_paths=>nil}).returns(socket)
     end
 
-    mock(socket).close
     output_driver.run do
       output_driver.feed("tag", @time , {"log" => "hi"})
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-syslog_rfc5424
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3.pre.rc.11
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,7 @@ files:
 - README.md
 - Rakefile
 - fluent-plugin-syslog_rfc5424.gemspec
+- lib/fluent-plugin-syslog_rfc5424/version.rb
 - lib/fluent/plugin/formatter_syslog_rfc5424.rb
 - lib/fluent/plugin/out_syslog_rfc5424.rb
 - lib/rfc5424/formatter.rb
@@ -145,12 +146,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: FluentD output plugin to send messages via rfc5424