fluent-plugin-sumologic-cloud-syslog 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc1578a36f862ac01507d453ca8350c60372efd6
-  data.tar.gz: 5b70bff66226ac8825fbd755905933a3cfca92ff
+  metadata.gz: 9fbd5d2765b6436b661f0ba85d2643d241860b78
+  data.tar.gz: 19331eadf81f8686a4c74390d1beb29a5d8c0cf6
 SHA512:
-  metadata.gz: 2bf21eb35786fcf3c0ee842afdcc5f62ae8ac668f530f7e44a9c633cb4d6a27af7ead09473cf3ae647a6545a2bfd0b4c327e33b56418fe4d1e9bab54027c5b2f
-  data.tar.gz: 61f2320b80887d030696e36f7931519550a32777bfb6414a8f5bb94322f816f26e7055ebe8db63aef81b24ec2f7db1aa99c15c5a66fb64e27fe37231f21f3025
+  metadata.gz: b4c2423730252990ac8e09d24c14bf00858933b778d61680895ea646f131557718ad43f892ef5a5ab0888f3f9ba16a4170cf0ec4ab4c0f89af7f84476c86887f
+  data.tar.gz: f31e290ca1de21be6bdf6686273256da3ab1dbfd318d7086715ce21719da6c19a8809886f60dd81abf12257f28bc7101223f15eff5bef79965d1331d45f8e4dc

data/lib/fluent/plugin/out_sumologic_cloud_syslog.rb

@@ -105,13 +105,17 @@ module Fluent
                      'INFO'
                    end
 
-        # Send message to Sumo
-        logger(tag).log(severity, format(tag, time, record), time: Time.at(time)) { |header|
-          # Map syslog headers from record
-          @mappings.each do |name, record_key|
-            header.send("#{name}=", record[record_key]) unless record[record_key].nil?
+        # Send message to Sumologic
+        begin
+          logger(tag).log(severity, format(tag, time, record), time: Time.at(time)) do |header|
+            # Map syslog headers from record
+            @mappings.each do |name, record_key|
+              header.send("#{name}=", record[record_key]) unless record[record_key].nil?
+            end
           end
-        }
+        rescue => e
+          log.error e.to_s
+        end
       end
     end
   end

data/lib/sumologic_cloud_syslog/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module SumologicCloudSyslog
-  VERSION = '0.1.5'
+  VERSION = '0.1.7'
 end

data/test/fluent/test_out_sumologic_cloud_syslog.rb

@@ -18,7 +18,9 @@ require 'date'
 require 'minitest/mock'
 require 'fluent/plugin/out_sumologic_cloud_syslog'
 
-class SumologicCloudSyslogOutput < SSLTest
+class SumologicCloudSyslogOutput < Test::Unit::TestCase
+  include SSLTestHelper
+
   def setup
     Fluent::Test.setup
     @driver = nil

data/test/ssl.rb

@@ -1,53 +1,51 @@
 require 'socket'
 require 'openssl'
 
-class SSLTest < Test::Unit::TestCase
-    def ssl_server
-        @ssl_server ||= begin
-            tcp_server = TCPServer.new("localhost", 33000 + Random.rand(1000))
-            ssl_context = OpenSSL::SSL::SSLContext.new
-            ssl_context.cert = certificate
-            ssl_context.key = rsa_key
-            OpenSSL::SSL::SSLServer.new(tcp_server, ssl_context)
-        end
+module SSLTestHelper
+  def ssl_server
+    @ssl_server ||= begin
+      tcp_server = TCPServer.new("localhost", 33000 + Random.rand(1000))
+      ssl_context = OpenSSL::SSL::SSLContext.new
+      ssl_context.cert = certificate
+      ssl_context.key = rsa_key
+      OpenSSL::SSL::SSLServer.new(tcp_server, ssl_context)
     end
+  end
 
-    def ssl_client
-      tcp = TCPSocket.new("localhost", ssl_server.addr[1])
-      ctx = OpenSSL::SSL::SSLContext.new
-      ctx.set_params(verify_mode: OpenSSL::SSL::VERIFY_NONE)
-      ctx.cert = certificate
-      ctx.key = rsa_key
-      OpenSSL::SSL::SSLSocket.new(tcp, ctx)
-    end
-
-    def rsa_key
-        @rsa_key ||= OpenSSL::PKey::RSA.new(2048)
-    end
+  def ssl_client
+    tcp = TCPSocket.new("localhost", ssl_server.addr[1])
+    ctx = OpenSSL::SSL::SSLContext.new
+    ctx.set_params(verify_mode: OpenSSL::SSL::VERIFY_NONE)
+    ctx.cert = certificate
+    ctx.key = rsa_key
+    OpenSSL::SSL::SSLSocket.new(tcp, ctx)
+  end
 
-    def certificate
-        @cert ||= begin
-            subject = "/C=BE/O=Test/OU=Test/CN=Test"
+  def rsa_key
+    @rsa_key ||= OpenSSL::PKey::RSA.new(2048)
+  end
 
-            @cert = OpenSSL::X509::Certificate.new
-            @cert.subject = @cert.issuer = OpenSSL::X509::Name.parse(subject)
-            @cert.not_before = Time.now
-            @cert.not_after = Time.now + 365 * 24 * 60 * 60
-            @cert.public_key = rsa_key.public_key
-            @cert.serial = 0x0
-            @cert.version = 2
+  def certificate
+    @cert ||= begin
+      cert = OpenSSL::X509::Certificate.new
+      cert.subject = cert.issuer = OpenSSL::X509::Name.parse("/C=BE/O=Test/OU=Test/CN=Test")
+      cert.not_before = Time.now
+      cert.not_after = Time.now + 365 * 24 * 60 * 60
+      cert.public_key = rsa_key.public_key
+      cert.serial = 0x0
+      cert.version = 2
 
-            ef = OpenSSL::X509::ExtensionFactory.new
-            ef.subject_certificate = @cert
-            ef.issuer_certificate = @cert
-            @cert.extensions = [
-                ef.create_extension("basicConstraints","CA:TRUE", true),
-                ef.create_extension("subjectKeyIdentifier", "hash"),
-                # ef.create_extension("keyUsage", "cRLSign,keyCertSign", true),
-            ]
-            @cert.add_extension ef.create_extension("authorityKeyIdentifier", "keyid:always,issuer:always")
-            @cert.sign(rsa_key, OpenSSL::Digest::SHA1.new)
-            @cert
-        end
+      ef = OpenSSL::X509::ExtensionFactory.new
+      ef.subject_certificate = cert
+      ef.issuer_certificate = cert
+      cert.extensions = [
+        ef.create_extension("basicConstraints","CA:TRUE", true),
+        ef.create_extension("subjectKeyIdentifier", "hash"),
+        # ef.create_extension("keyUsage", "cRLSign,keyCertSign", true),
+      ]
+      cert.add_extension ef.create_extension("authorityKeyIdentifier", "keyid:always,issuer:always")
+      cert.sign(rsa_key, OpenSSL::Digest::SHA1.new)
+      cert
     end
+  end
 end

data/test/sumologic_cloud_syslog/test_ssl_transport.rb

@@ -16,7 +16,9 @@ require 'helper'
 require 'ssl'
 require 'sumologic_cloud_syslog/ssl_transport'
 
-class SSLTransport < SSLTest
+class SSLTransport < Test::Unit::TestCase
+  include SSLTestHelper
+
   def test_ok_connection
     server = ssl_server
     st = Thread.new {
@@ -34,7 +36,6 @@ class SSLTransport < SSLTest
 
   def test_retry
     client = Object.new
-    client.class.module_eval { attr_accessor :retries }
     def client.connect
       true
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sumologic-cloud-syslog
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Acquia Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd