fluent-plugin-syslog-d 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a59ddc2c82f560ff63aad43d5d84feba708e35f606e9aaeae1845c01f5726220
-  data.tar.gz: 3a60b852d3e1bc7d58e394de01555d50c8be50b5e5d3ec828fbc9b55e495546c
+  metadata.gz: 7de09d4cab52cec9d2d139f3533775145fb61c5277325835cc4b37a0da8dd91c
+  data.tar.gz: 31dfcd0086f8ba6141063104685b1034692c8ebd55acf17db4adb99b9ba46f45
 SHA512:
-  metadata.gz: cb93e7953eea4848f53ed18e915b66835b0ce19946e572a6defb5862cf7a83fc527bdcc067c09125a63d85abff692f2c61f93bbc84a2558e704ade3ff65c4cee
-  data.tar.gz: ccd356c4f82526d74b0c0ffad2cec06f5a2998e7e704775f21644c31c9a51f488aa723d8c69a6d66944de342cc56cfa8dde0bde7151f192ffde3080e44bd9f5b
+  metadata.gz: 54723ad8a57fd7074621db1d2b481a0017ac1c342ec7f03242b551944e8fca32fea04d838d221c1f533044ccb9ede5541c22c240adcae643acc57820f56381b9
+  data.tar.gz: 0f5f34eed97561fd519bbc66fcf8187cc7916c76ee5a8656af811f6698fc5322653bda7832edadb00db458aee3d105e1cfb194fbe2461d7f5fa7c9348610e826

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-syslog-tls (2.0.0)
+    fluent-plugin-syslog-d (0.0.2)
       fluentd (>= 0.14.0, < 2)
 
 GEM
@@ -9,7 +9,8 @@ GEM
   specs:
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    cool.io (1.5.4)
+    concurrent-ruby (1.1.9)
+    cool.io (1.7.1)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -18,30 +19,30 @@ GEM
       tins (~> 1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    dig_rb (1.0.1)
     docile (1.3.1)
-    fluentd (1.5.0)
+    fluentd (1.13.0)
+      bundler
       cool.io (>= 1.4.5, < 2.0.0)
-      dig_rb (~> 1.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
-      msgpack (>= 0.7.0, < 2.0.0)
-      serverengine (>= 2.0.4, < 3.0.0)
+      msgpack (>= 1.3.1, < 2.0.0)
+      serverengine (>= 2.2.2, < 3.0.0)
       sigdump (~> 0.2.2)
       strptime (>= 0.2.2, < 1.0.0)
-      tzinfo (~> 1.0)
+      tzinfo (>= 1.0, < 3.0)
       tzinfo-data (~> 1.0)
+      webrick (>= 1.4.2, < 1.8.0)
       yajl-ruby (~> 1.0)
     hashdiff (0.4.0)
     http_parser.rb (0.6.0)
     json (2.2.0)
     minitest (5.11.3)
     minitest-stub_any_instance (1.0.2)
-    msgpack (1.2.10)
+    msgpack (1.4.2)
     power_assert (1.1.4)
     public_suffix (3.1.0)
     rake (12.3.2)
     safe_yaml (1.0.5)
-    serverengine (2.1.1)
+    serverengine (2.2.4)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
     simplecov (0.16.1)
@@ -49,22 +50,22 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    strptime (0.2.3)
+    strptime (0.2.5)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
     test-unit (3.3.3)
       power_assert
     thor (0.20.3)
-    thread_safe (0.3.6)
     tins (1.20.3)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    tzinfo-data (1.2019.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2021.1)
       tzinfo (>= 1.0.0)
     webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
+    webrick (1.7.0)
     yajl-ruby (1.4.1)
 
 PLATFORMS
@@ -72,7 +73,7 @@ PLATFORMS
 
 DEPENDENCIES
   coveralls
-  fluent-plugin-syslog-tls!
+  fluent-plugin-syslog-d!
   minitest (~> 5.8)
   minitest-stub_any_instance (~> 1.0.0)
   rake

data/lib/syslog_tls/version.rb

@@ -14,5 +14,5 @@
 # limitations under the License.
 
 module SyslogTls
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/test/fluent/test_out_syslog_tls.rb

@@ -85,7 +85,7 @@ class SyslogTlsOutputTest < Test::Unit::TestCase
       instance.process('test', {time.to_i => record})
     end
 
-    assert_equal "<134>1 #{time.to_datetime.rfc3339} - - - - - #{record.to_json.to_s}\n\n", logger.transport.string
+    assert_equal "<134>#{time.to_datetime.strftime("%b %d %H:%M:%S")}   #{record.to_json.to_s}\n\n", logger.transport.string
   end
 
   def test_message_headers_mapping
@@ -110,7 +110,7 @@ class SyslogTlsOutputTest < Test::Unit::TestCase
       instance.process('test', {time.to_i => record})
     end
 
-    assert_true logger.transport.string.start_with?("<134>1 #{time.to_datetime.rfc3339} host app #{$$} 1000 [TOKEN]")
+    assert_true logger.transport.string.start_with?("<134>#{time.to_datetime.strftime("%b %d %H:%M:%S")} host app")
   end
 
   def test_message_severity_mapping
@@ -132,7 +132,7 @@ class SyslogTlsOutputTest < Test::Unit::TestCase
       instance.process('test', {time.to_i => record})
     end
 
-    assert_true logger.transport.string.start_with?("<128>1")
+    assert_true logger.transport.string.start_with?("<128>")
   end
 
   def test_formatter
@@ -156,7 +156,7 @@ class SyslogTlsOutputTest < Test::Unit::TestCase
     end
 
     formatted_time = time.dup.utc.strftime("%Y-%m-%dT%H:%M:%SZ")
-    assert_equal "<134>1 #{time.to_datetime.rfc3339} - - - - [TOKEN] #{formatted_time}\ttest\t#{record.to_json.to_s}\n\n", logger.transport.string
+    assert_equal "<134>#{time.to_datetime.strftime("%b %d %H:%M:%S")}   #{formatted_time}\ttest\t#{record.to_json.to_s}\n\n", logger.transport.string
   end
 
   def test_ssl
@@ -166,7 +166,7 @@ class SyslogTlsOutputTest < Test::Unit::TestCase
     server = ssl_server
     st = Thread.new {
         client = server.accept
-        assert_equal "<134>1 #{time.to_datetime.rfc3339} host app #{$$} 1000 [1234567890] #{record.to_json.to_s}\n", client.gets
+        assert_equal "<134>#{time.to_datetime.strftime("%b %d %H:%M:%S")} host app #{record.to_json.to_s}\n", client.gets
         client.close
     }
 

data/test/syslog_tls/test_logger.rb

@@ -23,7 +23,7 @@ class LoggerTest < Test::Unit::TestCase
     l = SyslogTls::Logger.new(io, "TOKEN")
     time = Time.now
     l.log(:WARN, "MESSAGE", time: time)
-    assert_equal "<132>1 #{time.to_datetime.rfc3339} - - - - [TOKEN] MESSAGE\n", io.string
+    assert_equal "<132>#{time.to_datetime.strftime("%b %d %H:%M:%S")}   MESSAGE\n", io.string
   end
 
   def test_logger_default_headers
@@ -35,7 +35,7 @@ class LoggerTest < Test::Unit::TestCase
     l.facility("SYSLOG")
     time = Time.now
     l.log(:WARN, "MESSAGE", time: time)
-    assert_equal "<44>1 #{time.to_datetime.rfc3339} hostname appname #{$$} - [TOKEN] MESSAGE\n", io.string
+    assert_equal "<44>#{time.to_datetime.strftime("%b %d %H:%M:%S")} hostname appname MESSAGE\n", io.string
   end
 
   def test_logger_closed

data/test/syslog_tls/test_protocol.rb

@@ -30,7 +30,7 @@ class ProtocolTest < Test::Unit::TestCase
     assert_equal SyslogTls::NIL_VALUE, h.procid
     assert_equal SyslogTls::NIL_VALUE, h.msgid
 
-    assert_equal "<#{h.pri}>1 #{h.timestamp.to_datetime.rfc3339} - - - -", h.to_s
+    assert_equal "<#{h.pri}>#{h.timestamp.to_datetime.strftime("%b %d %H:%M:%S")}  ", h.to_s
   end
 
   def test_header_facility_setter
@@ -70,25 +70,25 @@ class ProtocolTest < Test::Unit::TestCase
   def test_header_hostname
     h = SyslogTls::Header.new
     h.hostname = "hostname"
-    assert_equal "<#{h.pri}>1 #{h.timestamp.to_datetime.rfc3339} hostname - - -", h.to_s
+    assert_equal "<#{h.pri}>#{h.timestamp.to_datetime.strftime("%b %d %H:%M:%S")} hostname ", h.to_s
   end
 
   def test_header_appname
     h = SyslogTls::Header.new
     h.app_name = "appname"
-    assert_equal "<#{h.pri}>1 #{h.timestamp.to_datetime.rfc3339} - appname - -", h.to_s
+    assert_equal "<#{h.pri}>#{h.timestamp.to_datetime.strftime("%b %d %H:%M:%S")}  appname", h.to_s
   end
 
   def test_header_procid
     h = SyslogTls::Header.new
     h.procid = $$
-    assert_equal "<#{h.pri}>1 #{h.timestamp.to_datetime.rfc3339} - - #{$$} -", h.to_s
+    assert_equal "<#{h.pri}>#{h.timestamp.to_datetime.strftime("%b %d %H:%M:%S")}  ", h.to_s
   end
 
   def test_header_msgid
     h = SyslogTls::Header.new
     h.msgid = "msgid"
-    assert_equal "<#{h.pri}>1 #{h.timestamp.to_datetime.rfc3339} - - - msgid", h.to_s
+    assert_equal "<#{h.pri}>#{h.timestamp.to_datetime.strftime("%b %d %H:%M:%S")}  ", h.to_s
   end
 
   def test_structured_data_defaults
@@ -118,26 +118,26 @@ class ProtocolTest < Test::Unit::TestCase
     assert_equal 0, m.structured_data.length
     assert_equal "", m.msg
 
-    assert_equal "<134>1 #{m.header.timestamp.to_datetime.rfc3339} - - - - -\n", m.to_s
+    assert_equal "<134>#{m.header.timestamp.to_datetime.strftime("%b %d %H:%M:%S")}  \n", m.to_s
   end
 
   def test_message_msg
     m = SyslogTls::Message.new
     m.msg = "TEST"
-    assert_equal "<134>1 #{m.header.timestamp.to_datetime.rfc3339} - - - - - TEST\n", m.to_s
+    assert_equal "<134>#{m.header.timestamp.to_datetime.strftime("%b %d %H:%M:%S")}   TEST\n", m.to_s
   end
 
   def test_message_sd
     m = SyslogTls::Message.new
     m.structured_data << SyslogTls::StructuredData.new("TEST_ID")
-    assert_equal "<134>1 #{m.header.timestamp.to_datetime.rfc3339} - - - - [TEST_ID]\n", m.to_s
+    assert_equal "<134>#{m.header.timestamp.to_datetime.strftime("%b %d %H:%M:%S")}  \n", m.to_s
   end
 
   def test_message_multiple_sd
     m = SyslogTls::Message.new
     m.structured_data << SyslogTls::StructuredData.new("TEST_ID")
     m.structured_data << SyslogTls::StructuredData.new("TEST_ID2")
-    assert_equal "<134>1 #{m.header.timestamp.to_datetime.rfc3339} - - - - [TEST_ID][TEST_ID2]\n", m.to_s
+    assert_equal "<134>#{m.header.timestamp.to_datetime.strftime("%b %d %H:%M:%S")}  \n", m.to_s
   end
 
   def test_message_multiple_sd_msg
@@ -145,6 +145,6 @@ class ProtocolTest < Test::Unit::TestCase
     m.structured_data << SyslogTls::StructuredData.new("TEST_ID")
     m.structured_data << SyslogTls::StructuredData.new("TEST_ID2")
     m.msg = "MSG"
-    assert_equal "<134>1 #{m.header.timestamp.to_datetime.rfc3339} - - - - [TEST_ID][TEST_ID2] MSG\n", m.to_s
+    assert_equal "<134>#{m.header.timestamp.to_datetime.strftime("%b %d %H:%M:%S")}   MSG\n", m.to_s
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-syslog-d
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Juan Manuel Cristóbal MOreno