bunny-publisher 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9578d81f2d9e983145b25db99694b6600ceb72260af7400d53d222a4f0723d09
-  data.tar.gz: 88a145f8ea8e6859d383d9983093d467140f3fe3104a164aa0526125da1defc0
+  metadata.gz: 114f01661b4bf20f7b8e3e0c2a09dba2b969cac13f5b9e1140edd0a8048b8f86
+  data.tar.gz: e3a18568ee95e4eca7d5093b9ed3326cffe71c1890c235903d9f4de6395b6efd
 SHA512:
-  metadata.gz: b256c60e4c18f7c033867a18077273246188aabc01091a9cd27c3927330daa6f461ed35c1bef7890f1817937884c920fd25807530b0ddbf03a436c9dacaf8727
-  data.tar.gz: f669cd0022bc139539232aebc467bdba3a0c373fc121ce6a91d2304731b23002e1d51401e4c418435cb753e9ffeaa7f926f5ab52634c84edcc20b3c40c7b49f7
+  metadata.gz: 528c55964119b778c6d7573a489a76b0c315002ccdfff3770a34d26439f76e050e8a629012fe76739cefaffad667201ba1a24b9fa409401fb50b07eb4e6972cd
+  data.tar.gz: 933da9ba2d644c5138b4b091dede2935de7bab125cadd7007d1b4a7c311717ceb94bc417fe5251d77f7f11dbe7c757a2c45201d369044cb8b5fe14db6eea2a7e

data/CHANGELOG.md

@@ -4,7 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [Unreleased](https://github.com/veeqo/bunny-publisher/compare/v0.1.5...HEAD)
+## [Unreleased](https://github.com/veeqo/bunny-publisher/compare/v0.1.6...HEAD)
+
+
+## [0.1.6](https://github.com/veeqo/bunny-publisher/compare/v0.1.5...v0.1.6) - 2020-11-24
+
+### Fixed
+- [#8](https://github.com/veeqo/bunny-publisher/pull/8) Fix errors on recovery from connection failures
 
 
 ## [0.1.5](https://github.com/veeqo/bunny-publisher/compare/v0.1.4...v0.1.5) - 2020-11-04

data/lib/bunny_publisher/base.rb

@@ -45,14 +45,26 @@ module BunnyPublisher
     private
 
     def ensure_connection!
-      connect! unless connected?
+      @connection ||= build_connection
+
+      connection.start if connection.status == :not_connected # Lazy connection initialization.
+
+      wait_until_connection_ready(connection)
+
+      @channel ||= connection.create_channel
+      @exchange ||= build_exchange
     end
 
-    def connect!
-      @connection ||= build_connection
-      connection.start
-      @channel = connection.create_channel
-      @exchange = build_exchange
+    def wait_until_connection_ready(conn)
+      Timeout.timeout((conn.heartbeat || 60) * 2) do # 60 seconds is a default Bunny heartbeat
+        loop do
+          return if conn.status == :open && conn.transport.open?
+
+          sleep 0.001
+        end
+      end
+    rescue Timeout::Error
+      # Connection recovery takes too long, let the next interaction fail with error then.
     end
 
     def build_connection
@@ -64,9 +76,5 @@ module BunnyPublisher
 
       channel.exchange(@exchange_name, @exchange_options)
     end
-
-    def connected?
-      @connection&.connected? && channel
-    end
   end
 end

data/lib/bunny_publisher/mandatory.rb

@@ -51,9 +51,11 @@ module BunnyPublisher
 
     attr_reader :republish_connection, :republish_channel, :republish_exchange
 
-    def connect!
+    def ensure_connection!
       super
 
+      return if @on_return_set
+
       # `on_return` is called within a frameset of amqp connection.
       # Any interaction within the same connection leads to error. This is why we need extra connection.
       # https://github.com/ruby-amqp/bunny/blob/7fb05abf36637557f75a69790be78f9cc1cea807/lib/bunny/session.rb#L683
@@ -62,21 +64,18 @@ module BunnyPublisher
       else
         exchange.on_return { |*attrs| on_message_return(*attrs) }
       end
+
+      @on_return_set = true
     end
 
     def ensure_republish_connection!
-      connect_for_republish! unless connected_for_republish?
-    end
+      @republish_connection ||= build_republish_connection
+      republish_connection.start if republish_connection.status == :not_connected # Lazy connection initialization.
 
-    def connected_for_republish?
-      republish_connection&.connected? && republish_channel
-    end
+      wait_until_connection_ready(republish_connection)
 
-    def connect_for_republish!
-      @republish_connection ||= build_republish_connection
-      republish_connection.start
-      @republish_channel = republish_connection.create_channel
-      @republish_exchange = clone_exchange_for_republish
+      @republish_channel ||= republish_connection.create_channel
+      @republish_exchange ||= clone_exchange_for_republish
     end
 
     def build_republish_connection

data/lib/bunny_publisher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BunnyPublisher
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bunny-publisher
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Rustam Sharshenov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: AMQP publisher for RabbitMQ based on Bunny