garaio_bunny 2.19.1 → 2.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6968f28e951ec5f7c22a54027c77e34ed1ed3cc0a192d8a349c3bd433f31765e
-  data.tar.gz: be7bdd9c7913c0055dfb4ebfda34fe494bcd8f18732afe105a6b5bc04979bc1a
+  metadata.gz: 8794b01931d06fc7298999f5651a00e3703b9eda18ff145d668464aeadd0cf65
+  data.tar.gz: 23c03916fdfffa1d9812fd200350cb7f00a8c066a641a4fcbd8c92076da3b63e
 SHA512:
-  metadata.gz: 1cdd517b7aa747e75c847cdd65a58fbd4c80b7e3e113d856d96936795aa9eab53d246c5a2f6dae097ca4a40f5e650e7b826e88bf5abaccb239a3de0ee8cccf06
-  data.tar.gz: 0c9cfb087ea822402c4383ac1438afb5ea92d5031a065eb29ec3fd9c4082476d312ceb8b07abb3834e3b7e0bb3dc325b250c50e8e2584e99c0087d15cef4932b
+  metadata.gz: 5db65b001870cdfea5658dd56b7219ef1f3007bf3d4a2c6c3e345f0d3438b3bff661fb00faaca6f3fb375d168da30c2ca12172873607a7cfcb18adcc87d46655
+  data.tar.gz: 82451e78bb5daf3f838c3969511797c3dd5646f3c77fbe76ca01d02063b432a713cc32922270ceb4c7bf021cb0c26ae877bb4218b3db292c7021bbca72fc123e

data/lib/bunny/channel.rb

@@ -165,7 +165,7 @@ module Bunny
     # @param [Bunny::Session] connection AMQP 0.9.1 connection
     # @param [Integer] id Channel id, pass nil to make Bunny automatically allocate it
     # @param [Bunny::ConsumerWorkPool] work_pool Thread pool for delivery processing, by default of size 1
-    def initialize(connection = nil, id = nil, work_pool = ConsumerWorkPool.new(1))
+    def initialize(connection = nil, id = nil, work_pool = ConsumerWorkPool.new(1, logger: connection&.logger))
       @connection = connection
       @logger     = connection.logger
       @id         = id || @connection.next_channel_id

data/lib/bunny/consumer_work_pool.rb

@@ -17,7 +17,7 @@ module Bunny
     attr_reader :size
     attr_reader :abort_on_exception
 
-    def initialize(size = 1, abort_on_exception = false, shutdown_timeout = 60)
+    def initialize(size = 1, abort_on_exception = false, shutdown_timeout = 60, logger:)
       @size  = size
       @abort_on_exception = abort_on_exception
       @shutdown_timeout = shutdown_timeout
@@ -26,6 +26,7 @@ module Bunny
       @queue = ::Queue.new
       @paused = false
       @running = false
+      @logger = logger
     end
 
 
@@ -107,9 +108,7 @@ module Bunny
           begin
             callable.call
           rescue ::StandardError => e
-            # TODO: use connection logger
-            $stderr.puts e.class.name
-            $stderr.puts e.message
+            @logger&.error("Uncaught exception in #{self.class}: #{e.inspect} @ #{e.backtrace[0]}")
           end
         end
       end

data/lib/bunny/queue.rb

@@ -35,6 +35,7 @@ module Bunny
       # old Bunny versions pass a connection here. In that case,
       # we just use default channel from it. MK.
       @channel          = channel
+      @logger           = channel.connection.logger
       @name             = name
       @options          = self.class.add_default_options(name, opts)
 
@@ -337,15 +338,13 @@ module Bunny
         @channel.deregister_queue_named(old_name)
       end
 
-      # TODO: inject and use logger
-      # puts "Recovering queue #{@name}"
+      logger.info("Recovering queue #{@name}")
       begin
         declare! unless @options[:no_declare]
 
         @channel.register_queue(self)
       rescue Exception => e
-        # TODO: inject and use logger
-        puts "Caught #{e.inspect} while redeclaring and registering #{@name}!"
+        @logger.error("Caught #{e.inspect} while redeclaring and registering #{@name}!")
       end
       recover_bindings
     end
@@ -353,8 +352,7 @@ module Bunny
     # @private
     def recover_bindings
       @bindings.each do |b|
-        # TODO: inject and use logger
-        # puts "Recovering binding #{b.inspect}"
+        @logger.info("Recovering binding #{b.inspect}")
         self.bind(b[:exchange], b)
       end
     end

data/lib/bunny/session.rb

@@ -380,7 +380,11 @@ module Bunny
         if n && (ch = @channels[n])
           ch
         else
-          ch = Bunny::Channel.new(self, n, ConsumerWorkPool.new(consumer_pool_size || 1, consumer_pool_abort_on_exception, consumer_pool_shutdown_timeout))
+          work_pool = ConsumerWorkPool.new(consumer_pool_size || 1,
+                                           consumer_pool_abort_on_exception,
+                                           consumer_pool_shutdown_timeout,
+                                           logger: logger)
+          ch = Bunny::Channel.new(self, n, work_pool)
           ch.open
           ch
         end

data/lib/bunny/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "2.19.1"
+  VERSION = "2.19.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: garaio_bunny
 version: !ruby/object:Gem::Version
-  version: 2.19.1
+  version: 2.19.2
 platform: ruby
 authors:
 - Chris Duncan