bunny-publisher 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca9d3016280b5da1593899d13cc673628ebfaecd541c32ac111e9a0b33dc0694
-  data.tar.gz: d5c4c936574f79c726689f10a82f057691d20f26df50b46fdb5e799b6fca77bb
+  metadata.gz: 9578d81f2d9e983145b25db99694b6600ceb72260af7400d53d222a4f0723d09
+  data.tar.gz: 88a145f8ea8e6859d383d9983093d467140f3fe3104a164aa0526125da1defc0
 SHA512:
-  metadata.gz: 927b66235ed1b35777b79dcbd4581fdd17a56550074f2842939ba35be74d1069545398308df4a93e3be1ad6f056e4e4d46d607d041aab4a0092790df673d0e2f
-  data.tar.gz: 3f5493eff0fc05d825dcc17ab8ddc756e06cbabd2420be83ddbcdb3c84c1bc48d8b673328f88dd690ee5e996dbd1272a59d9251b449acfe1d40c6cd17a2d5e5c
+  metadata.gz: b256c60e4c18f7c033867a18077273246188aabc01091a9cd27c3927330daa6f461ed35c1bef7890f1817937884c920fd25807530b0ddbf03a436c9dacaf8727
+  data.tar.gz: f669cd0022bc139539232aebc467bdba3a0c373fc121ce6a91d2304731b23002e1d51401e4c418435cb753e9ffeaa7f926f5ab52634c84edcc20b3c40c7b49f7

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.4...HEAD)
+## [Unreleased](https://github.com/veeqo/bunny-publisher/compare/v0.1.5...HEAD)
+
+
+## [0.1.5](https://github.com/veeqo/bunny-publisher/compare/v0.1.4...v0.1.5) - 2020-11-04
+
+### Fixed
+- [#7](https://github.com/veeqo/bunny-publisher/pull/7) Enforce single channel for threaded apps
 
 
 ## [0.1.4](https://github.com/veeqo/bunny-publisher/compare/v0.1.3...v0.1.4) - 2020-11-03

data/lib/bunny_publisher/base.rb

@@ -8,7 +8,7 @@ module BunnyPublisher
 
     define_callbacks :after_publish, :before_publish, :around_publish
 
-    attr_reader :connection
+    attr_reader :connection, :channel, :exchange
 
     def initialize(publish_connection: nil, connection: nil, exchange: nil, exchange_options: {}, **options)
       @mutex = Mutex.new
@@ -25,13 +25,15 @@ module BunnyPublisher
     end
 
     def publish(message, options = {})
-      ensure_connection!
+      @mutex.synchronize do
+        ensure_connection!
 
-      run_callback(:before_publish, message, options)
-      result = run_callback(:around_publish, message, options) { exchange.publish(message, options) }
-      run_callback(:after_publish, message, options)
+        run_callback(:before_publish, message, options)
+        result = run_callback(:around_publish, message, options) { exchange.publish(message, options) }
+        run_callback(:after_publish, message, options)
 
-      result
+        result
+      end
     end
 
     def close
@@ -43,31 +45,14 @@ module BunnyPublisher
     private
 
     def ensure_connection!
-      @mutex.synchronize { connect! unless connected? }
+      connect! unless connected?
     end
 
     def connect!
       @connection ||= build_connection
       connection.start
-
-      connection_variables[:channel] ||= connection.create_channel
-      connection_variables[:exchange] ||= build_exchange
-    end
-
-    def thread_variables
-      Thread.current[:bunny_publisher] ||= {}.compare_by_identity
-    end
-
-    def connection_variables
-      thread_variables[connection] ||= {}
-    end
-
-    def channel
-      connection_variables[:channel]
-    end
-
-    def exchange
-      connection_variables[:exchange]
+      @channel = connection.create_channel
+      @exchange = build_exchange
     end
 
     def build_connection

data/lib/bunny_publisher/mandatory.rb

@@ -49,7 +49,7 @@ module BunnyPublisher
 
     private
 
-    attr_reader :republish_connection
+    attr_reader :republish_connection, :republish_channel, :republish_exchange
 
     def connect!
       super
@@ -65,7 +65,7 @@ module BunnyPublisher
     end
 
     def ensure_republish_connection!
-      @republish_mutex.synchronize { connect_for_republish! unless connected_for_republish? }
+      connect_for_republish! unless connected_for_republish?
     end
 
     def connected_for_republish?
@@ -75,31 +75,19 @@ module BunnyPublisher
     def connect_for_republish!
       @republish_connection ||= build_republish_connection
       republish_connection.start
-
-      republish_connection_variables[:republish_channel] ||= republish_connection.create_channel
-      republish_connection_variables[:republish_exchange] ||= build_republish_exchange
-    end
-
-    def republish_connection_variables
-      thread_variables[republish_connection] ||= {}
-    end
-
-    def republish_channel
-      republish_connection_variables[:republish_channel]
-    end
-
-    def republish_exchange
-      republish_connection_variables[:republish_exchange]
+      @republish_channel = republish_connection.create_channel
+      @republish_exchange = clone_exchange_for_republish
     end
 
     def build_republish_connection
       Bunny.new(connection.instance_variable_get(:'@opts')) # TODO: find more elegant way to "clone" connection
     end
 
-    def build_republish_exchange
-      return republish_channel.default_exchange if @exchange_name.nil? || @exchange_name == ''
+    def clone_exchange_for_republish
+      republish_channel.default_exchange if exchange.name == ''
 
-      republish_channel.exchange(@exchange_name, @exchange_options)
+      republish_channel.exchange exchange.name,
+                                 exchange.instance_variable_get(:'@options').merge(type: exchange.type)
     end
 
     def on_message_return(return_info, properties, message)
@@ -121,14 +109,16 @@ module BunnyPublisher
     end
 
     def setup_queue_for_republish(return_info, properties, message)
-      ensure_republish_connection!
+      @republish_mutex.synchronize do
+        ensure_republish_connection!
 
-      queue = declare_republish_queue(return_info, properties, message)
+        queue = declare_republish_queue(return_info, properties, message)
 
-      # default exchange already has bindings with queues
-      declare_republish_queue_binding(queue, return_info, properties, message) unless republish_exchange.name == ''
+        # default exchange already has bindings with queues
+        declare_republish_queue_binding(queue, return_info, properties, message) unless republish_exchange.name == ''
 
-      republish_channel.deregister_queue(queue) # we are not going to work with this queue in this channel
+        republish_channel.deregister_queue(queue) # we are not going to work with this queue in this channel
+      end
     end
 
     def ensure_message_is_unrouted!(return_info, properties, message)

data/lib/bunny_publisher/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bunny-publisher
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Rustam Sharshenov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-03 00:00:00.000000000 Z
+date: 2020-11-04 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.1.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: AMQP publisher for RabbitMQ based on Bunny