fluent-plugin-rabbitmq 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fa22768ed1823cd072d1e226c9f6ea44cd3b0b2396e90066edcc76ae552124f
-  data.tar.gz: bf85c005c06eef232a104e561ef5cd6e90c35618099f957c4c401adbf226d899
+  metadata.gz: 70d1f5b2d602e09a3d304968d2de7a0011cdce7da8572efb4f3ae53ea876f823
+  data.tar.gz: 07d5c5425e4ebe4e5289d5f53349e5e6eaa5b638aeaa50188de610a8aca06908
 SHA512:
-  metadata.gz: 9cae2d54e168c4f6158f8d0c32e114a1b136d5e596ed8ec64afc2cef1767c8ea6a7e6958a57b15a0f84b5a464ad7378fb7c1cc2fdbf191a45942ab59d110f37c
-  data.tar.gz: b2668f14ef34eaffaefed06b3a80394a7f2a404a3d0c94c002dd91a5c42e1fd2ef5597002e2e06504b5a0cf4633042a777bf4395195d73c6b18cac30502e90e5
+  metadata.gz: 1f43d4ed05bcae822f9c86f544b8f586ac710ceba55ac7de9ba871580dd96bb89053f1f41c2fdf9d23ddcd8516a2fd2659e43cf1ae9c8039dd5c020db41625e2
+  data.tar.gz: ee11e9b5a5ba11d268d25be3d196affe47a7eacd6d3980918cccc1eb8e678e00c9f9f63517b4d8f6c8448baf08e9ba7be22005da30bd81605494a19ebaeae12f

data/fluent-plugin-rabbitmq.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-rabbitmq"
-  spec.version       = "0.1.1"
+  spec.version       = "0.1.3"
   spec.authors       = ["NTT Communications"]
   spec.email         = ["masaki.matsushita@ntt.com"]
 

data/lib/fluent/plugin/in_rabbitmq.rb

@@ -105,7 +105,6 @@ module Fluent::Plugin
       bunny_options[:tls_key] = @tls_key if @tls_key
       bunny_options[:tls_ca_certificates] = @tls_ca_certificates if @tls_ca_certificates
       bunny_options[:verify_peer] = @verify_peer
-      bunny_options[:logger] = log
 
       @parser = parser_create
 
@@ -143,21 +142,26 @@ module Fluent::Plugin
         queue.bind(@exchange, routing_key: @routing_key)
       end
       queue.subscribe(manual_ack: @manual_ack) do |delivery_info, properties, payload|
-        @parser.parse(payload) do |time, record|
-          time = if properties[:timestamp]
-                    Fluent::EventTime.from_time(properties[:timestamp])
-                 else
-                    time
-                 end
-          if @include_headers
-            record[@headers_key] = properties.headers
+        begin
+          @parser.parse(payload) do |time, record|
+            time = if properties[:timestamp]
+                     Fluent::EventTime.from_time(properties[:timestamp])
+                   else
+                     time
+                   end
+            if @include_headers
+              record[@headers_key] = properties.headers
+            end
+            if @include_delivery_info
+              record[@delivery_info_key] = delivery_info
+            end
+            router.emit(@tag, time, record)
           end
-          if @include_delivery_info
-            record[@delivery_info_key] = delivery_info
-          end
-          router.emit(@tag, time, record)
+        rescue Fluent::Plugin::Parser::ParserError => e
+          log.error "Parser error: #{e.message}", error: e, payload: payload, tag: @tag
+        ensure
+          channel.ack(delivery_info.delivery_tag) if @manual_ack
         end
-        channel.ack(delivery_info.delivery_tag) if @manual_ack
       end
     end
     

data/lib/fluent/plugin/out_rabbitmq.rb

@@ -95,7 +95,6 @@ module Fluent::Plugin
       bunny_options[:tls_key] = @tls_key if @tls_key
       bunny_options[:tls_ca_certificates] = @tls_ca_certificates if @tls_ca_certificates
       bunny_options[:verify_peer] = @verify_peer
-      bunny_options[:logger] = log
 
       @bunny = Bunny.new(bunny_options)
 
@@ -140,7 +139,7 @@ module Fluent::Plugin
       @publish_options[:timestamp] = time.to_i if @timestamp
 
       if @exchange_type != "fanout"
-        @publish_options[:routing_key] = @routing_key ? @routing_key : tag
+        @publish_options[:routing_key] = @routing_key || tag
       end
 
       if @id_key

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - NTT Communications
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-13 00:00:00.000000000 Z
+date: 2024-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: fluent plugin for rabbitmq (AMQP)