fluent-plugin-syslog_rfc5424 0.7.1 → 0.7.2.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b48ffa9b862c6c8b5702cd03cc770ebac19253b
-  data.tar.gz: 0c731a33f0852e99b92394914cff3e961dd52412
+  metadata.gz: 55876ed60c542906481e819020027efa7c223f4b
+  data.tar.gz: 3965ee69dc012b8ca1c324d554a139f9bbb68bb3
 SHA512:
-  metadata.gz: 2ed768e5e2ba2e23b610c55c6d36f93a19e6c6744afc2b6e5e3388fe6c33aed722e3f281218c710dea39d9cfacf0f537edde4700153dc4dcdf361d636eb0a9db
-  data.tar.gz: fa0e4d70b88fcd9c7c422b5f272042ee8ba61387cc7462817b2468e4cdae86963a00d5055c4999efec1d70bb511d660ee1fdf089853cd11e6188860f10cd0220
+  metadata.gz: 0d4576615755b4452a30b96389e0dbc840cf02f0dbafbda56125395c3dbecade90e8a8909e90028277fe425318b2a574efc1d39e325dd123c56b22dd28dedb37
+  data.tar.gz: 76f28ca0e4288f35fee1bed8466f08d6a9fff3aac11533b476642f3159b2c90b2fa3776f5f793b987676a692c2c38310bf13acf7a91952ee4239c3c52f77200e

data/fluent-plugin-syslog_rfc5424.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-syslog_rfc5424"
-  spec.version       = "0.7.1"
+  spec.version       = "0.7.2.alpha1"
   spec.authors       = ["Pivotal"]
   spec.email         = %w(cf-loggregator@pivotal.io)
   spec.homepage      = "https://github.com/cloudfoundry/fluent-plugin-syslog_rfc5424"

data/lib/fluent/plugin/formatter_syslog_rfc5424.rb

@@ -32,7 +32,7 @@ module Fluent
         log.debug("RFC 5424 Message")
         log.debug(msg)
 
-        return msg unless @rfc6587_message_size
+        return msg + "\n" unless @rfc6587_message_size
 
         msg.length.to_s + ' ' + msg
       end

data/lib/fluent/plugin/out_syslog_rfc5424.rb

@@ -28,9 +28,10 @@ module Fluent
         tag = chunk.metadata.tag
         chunk.each do |time, record|
           begin
-            socket.puts @formatter.format(tag, time, record)
+            socket.write @formatter.format(tag, time, record)
           rescue
             @sockets[socket_key(@transport.to_sym, @host, @port)] = nil
+            socket.close
             raise
           end
         end
@@ -66,4 +67,4 @@ module Fluent
       end
     end
   end
-end
+end`

data/test/plugin/formatter_syslog_rfc5424_spec.rb

@@ -18,7 +18,7 @@ class FormatterSyslogRFC5424Test < Test::Unit::TestCase
     tag = "test-formatter"
     time = Fluent::EventTime.new(0, 123456000)
     record = {"log" => "test-log"}
-    assert_equal "<14>1 1970-01-01T00:00:00.123456+00:00 - - - - - test-log",
+    assert_equal "<14>1 1970-01-01T00:00:00.123456+00:00 - - - - - test-log\n",
                  formatter_driver.instance.format(tag, time, record)
   end
 
@@ -30,7 +30,7 @@ class FormatterSyslogRFC5424Test < Test::Unit::TestCase
     tag = "test-formatter"
     time = Fluent::EventTime.new(0, 123456000)
     record = {"log" => "test-log"}
-    assert_equal "<14>1 1970-01-01T00:00:00.123456+00:00 - - - - - test-log",
+    assert_equal "<14>1 1970-01-01T00:00:00.123456+00:00 - - - - - test-log\n",
                  formatter_driver.instance.format(tag, time, record)
   end
 
@@ -59,7 +59,7 @@ class FormatterSyslogRFC5424Test < Test::Unit::TestCase
     time = Fluent::EventTime.new(0, 123456000)
     record = {"log" => "test-log", "example" => {"custom_field" => "custom-value"}}
 
-    formatted_message = "<14>1 1970-01-01T00:00:00.123456+00:00 - custom-value - - - test-log"
+    formatted_message = "<14>1 1970-01-01T00:00:00.123456+00:00 - custom-value - - - test-log\n"
     message_size = formatted_message.length
     assert_equal "#{formatted_message}",
                  formatter_driver.instance.format(tag, time, record)
@@ -75,7 +75,7 @@ class FormatterSyslogRFC5424Test < Test::Unit::TestCase
     time = Fluent::EventTime.new(0, 123456000)
     record = {"log" => "test-log", "example" => {"custom_field" => "custom-value"}}
 
-    formatted_message = "<14>1 1970-01-01T00:00:00.123456+00:00 - - custom-value - - test-log"
+    formatted_message = "<14>1 1970-01-01T00:00:00.123456+00:00 - - custom-value - - test-log\n"
     message_size = formatted_message.length
     assert_equal "#{formatted_message}",
                  formatter_driver.instance.format(tag, time, record)

data/test/plugin/out_syslog_rfc5424_spec.rb

@@ -31,7 +31,7 @@ class OutSyslogRFC5424Test < Test::Unit::TestCase
     )
 
     socket = Minitest::Mock.new
-    mock(socket).puts(@formatted_log)
+    mock(socket).write(@formatted_log)
     stub(socket).close
 
     any_instance_of(Fluent::Plugin::OutSyslogRFC5424) do |fluent_plugin|
@@ -51,14 +51,14 @@ class OutSyslogRFC5424Test < Test::Unit::TestCase
     )
 
     bad_socket = Minitest::Mock.new
-    mock(bad_socket).puts(@formatted_log) {
+    mock(bad_socket).write(@formatted_log) {
       raise StandardError
     }
     stub(bad_socket).close
 
 
     good_socket = Minitest::Mock.new
-    mock(good_socket).puts(@formatted_log)
+    mock(good_socket).write(@formatted_log)
     stub(good_socket).close
 
     any_instance_of(Fluent::Plugin::OutSyslogRFC5424) do |fluent_plugin|
@@ -80,7 +80,7 @@ class OutSyslogRFC5424Test < Test::Unit::TestCase
     )
 
     socket = Minitest::Mock.new
-    mock(socket).puts(@formatted_log)
+    mock(socket).write(@formatted_log)
     stub(socket).close
 
     any_instance_of(Fluent::Plugin::OutSyslogRFC5424) do |fluent_plugin|
@@ -102,7 +102,7 @@ class OutSyslogRFC5424Test < Test::Unit::TestCase
     )
 
     socket = Minitest::Mock.new
-    mock(socket).puts(@formatted_log)
+    mock(socket).write(@formatted_log)
     stub(socket).close
 
     any_instance_of(Fluent::Plugin::OutSyslogRFC5424) do |fluent_plugin|
@@ -124,7 +124,7 @@ class OutSyslogRFC5424Test < Test::Unit::TestCase
     )
 
     socket = Minitest::Mock.new
-    mock(socket).puts(@formatted_log)
+    mock(socket).write(@formatted_log)
     stub(socket).close
 
     any_instance_of(Fluent::Plugin::OutSyslogRFC5424) do |fluent_plugin|
@@ -144,7 +144,7 @@ class OutSyslogRFC5424Test < Test::Unit::TestCase
     )
 
     socket = Minitest::Mock.new
-    stub(socket).puts(@formatted_log)
+    stub(socket).write(@formatted_log)
 
     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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-syslog_rfc5424
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2.alpha1
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,9 +145,9 @@ 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