active_publisher 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d07df691c4875cf4b99d301fc9cc3113a83b8ecaf888b6d2b6320b887c74f2d
-  data.tar.gz: 5b15565ea6e5d191bd251d527bf5f32377ec27e6642453b9fee3942538edca2e
+  metadata.gz: e544e43595bfa0c8fd2159358394239cee4524429e9ed78b53c54314c374c089
+  data.tar.gz: e9d5529b42236c24f415b544123ffed7dca080cff2d27877ee04a70e42fafee6
 SHA512:
-  metadata.gz: 7517b881037d04cb66effd45d49e16b39adbbdd76dbc0568d49440e9fd6e0ba8c960c5abd0b0c8df38209efe3c40d751a92e4b469746e764ebf04c5be01de58d
-  data.tar.gz: fd049283784c2a6eca92fdf7ab008364edf1c4e691b7a2f8adf2a724a4478576c91c5375633f6253fb16f9e7c84e379ff5b6fdb8d02caf4ff8227252d1168df2
+  metadata.gz: 00af8b7c41f06088f9dbd55b106884a74b3d76693c456b8532ed8fafbf5e2ea9861a0c624c8c1474dba4203122c3730736f7214ee58fab75a629ad977edfe843
+  data.tar.gz: 40849817585017241be4928abbae027e1e8a5ae968a91eec4f7994b1e61ed0dc7f966da7c480809760d5e4e457db4a017fabed609c5d801c153cd6cb6e37dda1

data/.circleci/config.yml

@@ -0,0 +1,56 @@
+# Inspired by: http://mikebian.co/running-tests-against-multiple-ruby-versions-using-circleci/
+
+version: 2.1
+
+orbs:
+  ruby: circleci/ruby@1.1
+
+jobs:
+  test:
+    parallelism: 1
+    parameters:
+      ruby-image:
+        type: string
+    docker:
+      - image: << parameters.ruby-image >>
+      - image: rabbitmq
+
+    steps:
+      - checkout
+      - run:
+          name: install dockerize
+          command: wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && sudo tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
+          environment:
+            DOCKERIZE_VERSION: v0.3.0
+      - run:
+          name: Wait for rabbitmq
+          command: dockerize -wait tcp://localhost:5672 -timeout 1m
+      - run:
+          name: Install bundler
+          command: gem install bundler
+      - run:
+          name: Which bundler?
+          command: bundle -v
+      - run:
+          name: bundle install
+          command: bundle install
+      - run:
+          name: rspec
+          command: bundle exec rspec
+
+# strangely, there seems to be very little documentation about exactly how martix builds work.
+# By defining a param inside your job definition, Circle CI will automatically spawn a job for
+# unique param value passed via `matrix`. Neat!
+# https://circleci.com/blog/circleci-matrix-jobs/
+workflows:
+  build_and_test:
+    jobs:
+      - test:
+          matrix:
+            parameters:
+              ruby-image:
+                - circleci/ruby:2.5
+                - circleci/ruby:2.6
+                - circleci/ruby:2.7
+                - circleci/jruby:9.1
+                - circleci/jruby:9.2

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

@@ -2,7 +2,13 @@ module ActivePublisher
   module Async
     module InMemoryAdapter
       class ConsumerThread
-        attr_reader :thread, :queue, :sampled_queue_size, :last_tick_at
+        attr_reader :channel, :thread, :queue, :sampled_queue_size, :last_tick_at
+
+        if ::RUBY_PLATFORM == "java"
+          CHANNEL_CLOSED_ERRORS = [::MarchHare::ChannelAlreadyClosed]
+        else
+          CHANNEL_CLOSED_ERRORS = [::Bunny::ChannelAlreadyClosed]
+        end
 
         if ::RUBY_PLATFORM == "java"
           NETWORK_ERRORS = [::MarchHare::NetworkException, ::MarchHare::ConnectionRefused,
@@ -45,6 +51,32 @@ module ActivePublisher
           end
         end
 
+        def cleanup_up_channel
+          return if @channel.nil?
+          @channel.close
+        rescue => error
+          ::ActivePublisher.configuration.error_handler.call(error, {:status => "Cleaning up the channel"})
+        end
+
+        def handle_current_messages_on_unknown_error(current_messages)
+          current_messages.each do |message|
+            # Degrade to single message publish ... or at least attempt to
+            begin
+              ::ActivePublisher.publish(message.route, message.payload, message.exchange_name, message.options)
+              current_messages.delete(message)
+            rescue *CHANNEL_CLOSED_ERRORS
+              # If the channel is bad, raise!
+              raise
+            rescue *PRECONDITION_ERRORS => error
+              # Delete messages if rabbitmq cannot declare the exchange (or somet other precondition failed).
+              ::ActivePublisher.configuration.error_handler.call(error, {:reason => "precondition failed", :message => message})
+              current_messages.delete(message)
+            rescue => other_error
+              ::ActivePublisher.configuration.error_handler.call(other_error, {:route => message.route, :payload => message.payload, :exchange_name => message.exchange_name, :options => message.options})
+            end
+          end
+        end
+
         def make_channel
           channel = ::ActivePublisher::Async::InMemoryAdapter::Channel.new
           channel.confirm_select if ::ActivePublisher.configuration.publisher_confirms
@@ -57,54 +89,50 @@ module ActivePublisher
 
         def start_thread
           return if alive?
-          @thread = ::Thread.new do
-            loop do
-              # Sample the queue size so we don't shutdown when messages are in flight.
-              @sampled_queue_size = queue.size
-              current_messages = queue.pop_up_to(50, :timeout => 0.1)
-              update_last_tick_at
-              # If the queue is empty, we should continue to update to "last_tick_at" time.
-              next if current_messages.nil?
-
-              # We only look at active publisher messages. Everything else is dropped.
-              current_messages.select! { |message| message.is_a?(::ActivePublisher::Message) }
-
-              begin
-                @channel ||= make_channel
-
-                # 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)
-                  current_messages -= messages
-                end
-              rescue *NETWORK_ERRORS
-                # Sleep because connection is down
-                await_network_reconnect
-              rescue => unknown_error
-                ::ActivePublisher.configuration.error_handler.call(unknown_error, {:number_of_messages => current_messages.size})
-                current_messages.each do |message|
-                  # Degrade to single message publish ... or at least attempt to
-                  begin
-                    ::ActivePublisher.publish(message.route, message.payload, message.exchange_name, message.options)
-                    current_messages.delete(message)
-                  rescue *PRECONDITION_ERRORS => error
-                    # Delete messages if rabbitmq cannot declare the exchange (or somet other precondition failed).
-                    ::ActivePublisher.configuration.error_handler.call(error, {:reason => "precondition failed", :message => message})
-                    current_messages.delete(message)
-                  rescue => individual_error
-                    ::ActivePublisher.configuration.error_handler.call(individual_error, {:route => message.route, :payload => message.payload, :exchange_name => message.exchange_name, :options => message.options})
-                  end
-                end
-
-                # TODO: Find a way to bubble this out of the thread for logging purposes.
-                # Reraise the error out of the publisher loop. The Supervisor will restart the consumer.
-                raise unknown_error
-              ensure
-                # Always requeue anything that gets stuck.
-                queue.concat(current_messages) if current_messages && !current_messages.empty?
+          @channel = make_channel
+          @thread = ::Thread.new { start_consuming_thread }
+        end
+
+        def start_consuming_thread
+          loop do
+            # Sample the queue size so we don't shutdown when messages are in flight.
+            @sampled_queue_size = queue.size
+            current_messages = queue.pop_up_to(50, :timeout => 0.1)
+            update_last_tick_at
+            # If the queue is empty, we should continue to update to "last_tick_at" time.
+            next if current_messages.nil?
+
+            # 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)
+                current_messages -= messages
               end
+            rescue *CHANNEL_CLOSED_ERRORS
+              # If the channel is bad, raise without sending one-by-one!
+              raise
+            rescue *NETWORK_ERRORS
+              # Sleep because connection is down
+              await_network_reconnect
+            rescue => unknown_error
+              ::ActivePublisher.configuration.error_handler.call(unknown_error, {:number_of_messages => current_messages.size})
+
+              # Attempt to deliver a message one-by-one. Raise if a closed channel error appears.
+              handle_current_messages_on_unknown_error(current_messages)
+
+              # TODO: Find a way to bubble this out of the thread for logging purposes.
+              # Reraise the error out of the publisher loop. The Supervisor will restart the consumer.
+              raise unknown_error
+            ensure
+              # Always requeue anything that gets stuck.
+              queue.concat(current_messages) if current_messages && !current_messages.empty?
             end
           end
+        ensure
+          cleanup_up_channel
         end
 
         def publish_all(channel, exchange_name, messages)

data/lib/active_publisher/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_publisher
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -179,9 +179,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt

data/.travis.yml

@@ -1,14 +0,0 @@
-language: ruby
-rvm:
- - 2.3.8
- - 2.5.7
- - jruby-9.1.12.0
- - jruby-9.2.7.0
-addons:
-  apt:
-    packages:
-      - rabbitmq-server
-services:
- - rabbitmq
-sudo: false
-cache: bundler