fluent-plugin-amq 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d287b0bcc0aeab13403c142ef5e3fb4ad0c3300c
-  data.tar.gz: 52fbc8b519143325d9c223d8e93c54c29f526d7a
+  metadata.gz: 2f6e3b00afdbe3b1108912af865629f3d657cb28
+  data.tar.gz: 00aea0b8d8a89d7808fe23998999639d27ed09c9
 SHA512:
-  metadata.gz: 5495027ac972837f28ef64aa820049f92d4eddc44ad7ec07ee40672ca9bd9c4d705e1a3e8e9820fc8e8be7e2692129b039517c31b7119adf51f3d276f66f39c7
-  data.tar.gz: 956d15f3b28e85f2136fc4ea49853bce71c4be1e70ad1197d84c976c1dfbf43eb2fd5c51a0f73391613ab1fce6e5dd47312da0bac11bcb81072ec2f3b5a606d6
+  metadata.gz: c995d095cdba1b76ddf9bbc100bf553938dcf66a3fde0874c12cbda4bb74b1199e096a94db8de4d41f00c63f7e0b78452a7f48e6779133fed531885b5a2dfaa8
+  data.tar.gz: 8c989eadabd732ced9c120db595de4e35dea56428dd9daee1de2de222226f6618f2088bc42a481fb68450b790fb779cdce7c85dc9cbb7cfea3e0770e12257508

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.3"
+    s.version           = "0.0.4"
     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

@@ -4,7 +4,7 @@ require 'fluent/input'
 
 
 module Fluent
-  class AMQPInput < Input
+  class AMQInput < Input
     NAME = 'amq'
     Plugin.register_input(NAME, self)
 
@@ -43,11 +43,12 @@ module Fluent
       @thread = Thread.new do
         while !@stop
           begin
-            h = Handler.new log, @url, @tag, @router, @ssl_domain, @queue
+            h = Client.new log, @url, @tag, @router, @ssl_domain, @queue
             @container = Qpid::Proton::Container.new(h)
             @container.run
           rescue => e
             log.error "Error connecting to the AMQP bus #{e.message}"
+            log.error "Backtrace: #{e.backtrace}"
           end
         end
       end
@@ -61,7 +62,7 @@ module Fluent
     rescue
     end
 
-    class Handler < Qpid::Proton::MessagingHandler
+    class Client < Qpid::Proton::MessagingHandler
 
       def initialize(log, url, tag, router, ssl_domain, queue)
         super()
@@ -87,18 +88,12 @@ module Fluent
         @log.debug "Connection secured with #{c.transport.ssl.protocol_name.inspect}"
       end
 
-      def build_record(message)
-        begin
-          record = {
-            body: JSON.parse(message.body),
-            address: message.address,
-            msg_id: message.id
-          }
-        rescue => e
-          @log.error "Error decoding JSON from #{e.message}"
-          @log.error "Backtrace: #{e.backtrace}"
-        end
-
+      def build_json_record(message)
+        record = {
+          body: JSON.parse(message.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)
@@ -110,6 +105,16 @@ 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
@@ -118,6 +123,10 @@ module Fluent
         @router.emit(tag, time, record)
       end
 
+      def on_transport_error(transport)
+        raise "Connection error: #{transport.condition}"
+      end
+
       def on_disconnect event
         puts "FIMXE #{NAME}: disconnected, re-connecting"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-amq
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Anton Sherkhonov