active_publisher 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e544e43595bfa0c8fd2159358394239cee4524429e9ed78b53c54314c374c089
-  data.tar.gz: e9d5529b42236c24f415b544123ffed7dca080cff2d27877ee04a70e42fafee6
+  metadata.gz: 7e97ed28a1b00120dfcfc0c4650496dc1bb5417efaefa3e0f038f95f7f7fd55b
+  data.tar.gz: b4b59a6a0b6ad87c2c13e3d098c6864d31b46227a78e7597dc4ea4094c5bec29
 SHA512:
-  metadata.gz: 00af8b7c41f06088f9dbd55b106884a74b3d76693c456b8532ed8fafbf5e2ea9861a0c624c8c1474dba4203122c3730736f7214ee58fab75a629ad977edfe843
-  data.tar.gz: 40849817585017241be4928abbae027e1e8a5ae968a91eec4f7994b1e61ed0dc7f966da7c480809760d5e4e457db4a017fabed609c5d801c153cd6cb6e37dda1
+  metadata.gz: f427457f1582510097748cf5f980c13ca3e6e5c723a2b4268d3c77ade699f8b6ea596a9282fd653b97b40077bdf2011807a8869316710008f43855df58b99334
+  data.tar.gz: b6b09dc041ae29cf9f5cccd4846da30914a173d693158c731080e5519912e064d596b83340434d0412c634a365fd1097dd1420cbdd5e9a4ecc837d5b3939130e

data/lib/active_publisher/async/in_memory_adapter/consumer_thread.rb

@@ -52,8 +52,8 @@ module ActivePublisher
         end
 
         def cleanup_up_channel
-          return if @channel.nil?
-          @channel.close
+          return if channel.nil?
+          channel.close
         rescue => error
           ::ActivePublisher.configuration.error_handler.call(error, {:status => "Cleaning up the channel"})
         end
@@ -89,7 +89,6 @@ module ActivePublisher
 
         def start_thread
           return if alive?
-          @channel = make_channel
           @thread = ::Thread.new { start_consuming_thread }
         end
 
@@ -102,13 +101,15 @@ module ActivePublisher
             # If the queue is empty, we should continue to update to "last_tick_at" time.
             next if current_messages.nil?
 
+            @channel ||= make_channel
+
             # We only look at active publisher messages. Everything else is dropped.
             current_messages.select! { |message| message.is_a?(::ActivePublisher::Message) }
 
             begin
               # Only open a single connection for each group of messages to an exchange
               current_messages.group_by(&:exchange_name).each do |exchange_name, messages|
-                publish_all(@channel, exchange_name, messages)
+                publish_all(exchange_name, messages)
                 current_messages -= messages
               end
             rescue *CHANNEL_CLOSED_ERRORS
@@ -135,7 +136,7 @@ module ActivePublisher
           cleanup_up_channel
         end
 
-        def publish_all(channel, exchange_name, messages)
+        def publish_all(exchange_name, messages)
           exchange = channel.topic(exchange_name)
           messages.each do |message|
             fail ::ActivePublisher::ExchangeMismatchError, "bulk publish messages must match publish_all exchange_name" if message.exchange_name != exchange_name
@@ -144,10 +145,10 @@ module ActivePublisher
               exchange.publish(message.payload, options)
             end
           end
-          wait_for_confirms(channel)
+          wait_for_confirms
         end
 
-        def wait_for_confirms(channel)
+        def wait_for_confirms
           return true unless channel.using_publisher_confirms?
           channel.wait_for_confirms(::ActivePublisher.configuration.publisher_confirms_timeout)
         end

data/lib/active_publisher/version.rb

@@ -1,3 +1,3 @@
 module ActivePublisher
-  VERSION = "1.2.4"
+  VERSION = "1.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_publisher
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny