fluent-plugin-amq 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c27e1cedbf9f1527a8d39eb855caafaf8e23f083
-  data.tar.gz: a26500e8750f7e6ea29736dd59835994508371c0
+  metadata.gz: cbfc8f05ff186e6a7a6b51e1def230d016185d2d
+  data.tar.gz: d2f94f10d607744c620a30bef43baa47dfc27576
 SHA512:
-  metadata.gz: 647063758ac5d1a9ce69580b3c46e1f155eee7daef561e33347310fbf53450d945232f1bd0e0ace461e86fc7ddb1ac58851f1761b01c3e761081a92f93899ab7
-  data.tar.gz: 1a5b2ffa8f3d98792f008a624d4baabe2e041d66f623c1e3cf403bbdbcbd6f3fd19be3e0dd927d77362b4d5b0e1952e46b5c3f0401bba06afb5a6a8b9ca708cf
+  metadata.gz: 5e63728cdc6108b9c20be519102fbc5e591ff5aec05004b4f1c4e135730f08b4cea20a7f3e0e24f2640e4e9e2dc7b1a86f721132631883211ca7ee5af07f0328
+  data.tar.gz: 0022d4437bd9c0b59afc271abb16a92b53bf0d5fb794858331a10f7252f57874458d9f46f6d4ba99925466d994c09f17ac67b183789574547d4e2e9c78eeb215

data/fluent-plugin-amq.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
     s.name              = "fluent-plugin-amq"
-    s.version           = "0.0.5"
+    s.version           = "0.0.6"
     s.authors           = ["Anton Sherkhonov"]
     s.email             = ["sherkhonov@gmail.com"]
     s.homepage          = "https://github.com/t0ffel/fluent-plugin-amq"

data/lib/fluent/plugin/in_amq.rb

@@ -31,7 +31,11 @@ module Fluent
       raise ConfigError, "#{NAME}: '#{@cert}' file is missing" unless File.file?(@cert)
       raise ConfigError, "#{NAME}: '#{@private_key}' file is missing" unless File.file?(@private_key)
       @ssl_domain = Qpid::Proton::SSLDomain.new(Qpid::Proton::SSLDomain::MODE_CLIENT)
-      @ssl_domain.credentials(@cert, @private_key, @key_pass)
+      begin
+        @ssl_domain.credentials(@cert, @private_key, @key_pass)
+      rescue Exception => e
+        raise ConfigError, "#{NAME}: Unable to create credentials: #{e}"
+      end
       begin
         @url = Qpid::Proton::uri @url
       rescue Exception => e
@@ -90,12 +94,16 @@ module Fluent
         @log.debug "Connection secured with #{c.transport.ssl.protocol_name.inspect}"
       end
 
-      def build_json_record(message)
-        record = {
-          body: JSON.parse(message.body),
-          address: message.address,
-          msg_id: message.id
-        }
+      def build_record(message)
+        begin
+          body = JSON.parse(message.body)
+        rescue => e
+          @log.warn "Error decoding JSON from the body of `#{message}`"
+          body = message.body
+        end
+        record = { body: body,
+                   address: message.address,
+                   msg_id: message.id }
         record[:properties] = message.properties if (message.properties and message.properties.size > 0)
         record[:annotations] = message.annotations if (message.annotations and message.annotations.size > 0)
         record[:instructions] = message.instructions if (message.instructions and message.instructions.size > 0)
@@ -107,16 +115,6 @@ module Fluent
         record
       end
 
-      def build_record(message)
-        begin
-          record = build_json_record(message)
-        rescue => e
-          @log.warn "Error decoding JSON from the body of `#{message}`"
-          record = { body: message }
-        end
-        record
-      end
-
       def on_message(delivery, message)
         record = build_record(message)
         time = Engine.now

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-amq
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Anton Sherkhonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake