emque-consuming 1.4.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 80e5272a0662b1b988a65aa018e660d5e20419df
-  data.tar.gz: 47219402278bc3a89aec13bb3b091589e132e8e9
+SHA256:
+  metadata.gz: a33e1cb0ba1688a3afd735ee7aee23a8b331e744cd0453056b96c4552f51dd02
+  data.tar.gz: c380412c8831d5ffa843d56da14a4ed45647d9c4fd075fe6a2aace2a1ee9ea29
 SHA512:
-  metadata.gz: c7d245d0cfd817397282b24cca7526f4ec4115c5a76d13f9dea449a48c427b9fc8727655b7c0ff915048bc8aff9e936a03906201b302de0f13bb7f8a61c24d54
-  data.tar.gz: '07900ca7faccf7cb4be8e01a16d69413b79bcab37f9b820d9a6c732fd8af055377cc8cc59351d63134ff6ce501158e88a47df35c85bc13df1c896d6d5fc6cb22'
+  metadata.gz: de3eb3ea8e8deb9ec9917df070c2559c5b2857fc996e59abaff091756d33c1b65603c310ea586dd744daae9224cf801405201beeff5426b7e28924ba2695de79
+  data.tar.gz: 78ebf244f57a11f99b3fe5cca252647e37a67179b863d031243d6ff636d3e8b2f076e2ab60992c932f52d6f9a21ee2e9f1c0d7619d107741d2a668cd973bcc8c

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 rvm:
-  - 2.3.1
   - 2.3.8
-  - 2.4.5
-  - 2.5.3
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
 script: bundle exec rake
 notifications:
   recipients:

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Emque Consuming CHANGELOG
 
+- [Add prefetch for DelayedMessageWorker](https://github.com/emque/emque-consuming/pull/81) (1.8.0)
+- [Update Rake to fix CVE-2020-8130](https://github.com/emque/emque-consuming/pull/80) (1.7.1)
+- [Update pipe-ruby to remove error handling](https://github.com/emque/emque-consuming/pull/78) 1.7.0
+- [Fixes bug with Bunny 2.12 failing when exchange names are symbols](https://github.com/emque/emque-consuming/pull/77) 1.6.1
+- [Re-enable pipe-ruby `raise_on_error` option to fix automatic retries directing messages to the error queue](https://github.com/emque/emque-consuming/pull/75) 1.6.0
+- [Update the puma gem to allow v3](https://github.com/emque/emque-consuming/pull/72) 1.5.0
 - [Disable pipe-ruby `raise_on_error` option to prevent duplicate erorrs](https://github.com/emque/emque-consuming/pull/74) 1.4.0
 - [Update minimum Ruby version to 2.3](https://github.com/emque/emque-consuming/pull/68) 1.3.0
 - [Update the oj gem to 2.18.5](https://github.com/emque/emque-consuming/pull/67) 1.2.4

data/emque-consuming.gemspec

@@ -6,7 +6,7 @@ require "emque/consuming/version"
 Gem::Specification.new do |spec|
   spec.name          = "emque-consuming"
   spec.version       = Emque::Consuming::VERSION
-  spec.authors       = ["Ryan Williams", "Dan Matthews"]
+  spec.authors       = ["Ryan Williams", "Dan Matthews", "Paul Hanyzewski"]
   spec.email         = ["oss@teamsnap.com"]
   spec.summary       = %q{Microservices framework for Ruby}
   spec.summary       = %q{Microservices framework for Ruby}
@@ -23,12 +23,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dante",     "~> 0.2.0"
   spec.add_dependency "oj",        "~> 2.18.5"
   spec.add_dependency "virtus",    "~> 1.0"
-  spec.add_dependency "puma",      "~> 2.12.0"
-  spec.add_dependency "pipe-ruby", "~> 0.2.0"
+  spec.add_dependency "puma",      "~> 3.12"
+  spec.add_dependency "pipe-ruby", "~> 1.0"
   spec.add_dependency "inflecto",  "~> 0.0.2"
 
   spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake",    "~> 10.4.2"
+  spec.add_development_dependency "rake",    ">= 12.3.3"  
   spec.add_development_dependency "rspec",   "~> 3.3"
   spec.add_development_dependency "bunny",   "~> 2.11.0"
   spec.add_development_dependency "timecop", "~> 0.7.1"

data/lib/emque/consuming/adapters/rabbit_mq/delayed_message_worker.rb

@@ -18,6 +18,10 @@ module Emque
           def initialize(connection)
             self.channel = connection.create_channel
 
+            if config.adapter.options[:prefetch]
+              channel.prefetch(config.adapter.options[:prefetch])
+            end
+
             self.delayed_message_exchange = channel.exchange(
               "emque.#{config.app_name}.delayed_message",
               {
@@ -69,8 +73,6 @@ module Emque
               ::Emque::Consuming::Consumer.new.consume(:process, message)
               channel.ack(delivery_info.delivery_tag)
             rescue StandardError => exception
-              logger.error "#{log_prefix} #{exception.class}: #{exception.message}"
-              exception.backtrace.each { |bt| logger.error "#{log_prefix} #{bt}" }
               if retryable_errors.any? { |error| exception.class.to_s =~ /#{error}/ }
                 retry_error(delivery_info, metadata, payload, exception)
               else

data/lib/emque/consuming/adapters/rabbit_mq/error_worker.rb

@@ -15,7 +15,7 @@ module Emque
           def retry_errors
             logger.info "#{log_prefix} starting"
             channel.open if channel.closed?
-            error_queue.message_count.times do
+            [error_queue.message_count, 100].min.times do
               delivery_info, properties, payload = error_queue.pop(
                 {:manual_ack => true}
               )
@@ -56,8 +56,6 @@ module Emque
               ::Emque::Consuming::Consumer.new.consume(:process, message)
               channel.ack(delivery_info.delivery_tag)
             rescue StandardError => exception
-              logger.error "#{log_prefix} #{exception.class}: #{exception.message}"
-              exception.backtrace.each { |bt| logger.error "#{log_prefix} #{bt}" }
               channel.nack(delivery_info.delivery_tag)
             end
           end

data/lib/emque/consuming/adapters/rabbit_mq/worker.rb

@@ -31,19 +31,22 @@ module Emque
               channel.prefetch(config.adapter.options[:prefetch])
             end
 
-            self.queue =
-              channel
-                .queue(
-                  "emque.#{config.app_name}.#{topic}",
-                  :durable => config.adapter.options[:durable],
-                  :auto_delete => config.adapter.options[:auto_delete],
-                  :arguments => {
-                    "x-dead-letter-exchange" => "#{config.app_name}.error"
-                  }
-                )
-                .bind(
-                  channel.fanout(topic, :durable => true, :auto_delete => false)
-                )
+            self.queue = channel
+              .queue(
+                "emque.#{config.app_name}.#{topic}",
+                :durable => config.adapter.options[:durable],
+                :auto_delete => config.adapter.options[:auto_delete],
+                :arguments => {
+                  "x-dead-letter-exchange" => "#{config.app_name}.error"
+                }
+              )
+              .bind(
+                channel.fanout(
+                  topic.to_s, 
+                  :durable => true, 
+                  :auto_delete => false,
+                 )
+              )
           end
 
           def start
@@ -79,8 +82,6 @@ module Emque
               ::Emque::Consuming::Consumer.new.consume(:process, message)
               channel.ack(delivery_info.delivery_tag)
             rescue StandardError => exception
-              logger.error "#{log_prefix} #{exception.class}: #{exception.message}"
-              exception.backtrace.each { |bt| logger.error "#{log_prefix} #{bt}" }
               if enable_delayed_message
                 begin
                   publish_to_delayed_message(delivery_info, metadata, payload)

data/lib/emque/consuming/command_receivers/http_server.rb

@@ -13,7 +13,6 @@ module Emque
         end
 
         def start
-          puma.options[:app] = Handler.new
           @thread = Thread.new { puma.run }
           status
         end
@@ -21,23 +20,20 @@ module Emque
         private
 
         def initialize_puma
-          self.puma =
-            Puma::CLI.new(
-              [],
-              Puma::Events.new(
-                Logger.new(:info),
-                Logger.new(:error)
-              )
-            )
-
-          puma.options[:binds] = [
-            "tcp://#{config.status_host}"+
-            ":#{config.status_port}"
-          ]
+          conf = Puma::Configuration.new do |user_config|
+            user_config.bind "tcp://#{config.status_host}:#{config.status_port}"
+            user_config.app Handler.new
+          end
+
+          self.puma = Puma::Launcher.new(conf, :events => Puma::Events.null)
 
           puma.define_singleton_method :set_process_title do
             # we don't want puma to take over the process name
           end
+
+          puma.define_singleton_method :setup_signals do
+            # we don't want puma to handle signals
+          end
         end
 
         class Handler

data/lib/emque/consuming/consumer.rb

@@ -11,6 +11,9 @@ module Emque
 
       def process(message)
         pipe(message, :through => [:parse, :route])
+      rescue => e
+        handle_error(e, message)
+        raise
       end
 
       private
@@ -29,6 +32,28 @@ module Emque
           message
         )
       end
+
+      def handle_error(e, subject)
+        context = {
+          :consumer => self.class.name,
+          :message => {
+            :current => subject.values,
+            :original => subject.original
+          },
+          :topic => subject.topic
+        }
+
+        # log the error by default
+        Emque::Consuming.logger.error("Error consuming message #{e}")
+        Emque::Consuming.logger.error(context)
+        Emque::Consuming.logger.error e.backtrace.join("\n") unless e.backtrace.nil?
+
+        Emque::Consuming.config.error_handlers.each do |handler|
+          handler.call(e, context)
+        end
+
+        Emque::Consuming.application.instance.notice_error(context)
+      end
     end
   end
 end

data/lib/emque/consuming/consumer/common.rb

@@ -16,7 +16,6 @@ module Emque
         def self.included(descendant)
           descendant.class_eval do
             attr_reader :message
-            private :handle_error, :pipe
           end
         end
 
@@ -26,36 +25,9 @@ module Emque
 
         def pipe_config
           @pipe_config ||= Pipe::Config.new(
-            :error_handlers => [method(:handle_error)],
-            :raise_on_error => false,
             :stop_on => ->(msg, _, _) { !(msg.respond_to?(:continue?) && msg.continue?) }
           )
         end
-
-        def handle_error(e, method:, subject:)
-          context = {
-            :consumer => self.class.name,
-            :message => {
-              :current => subject.values,
-              :original => subject.original
-            },
-            :offset => subject.offset,
-            :partition => subject.partition,
-            :pipe_method => method,
-            :topic => subject.topic
-          }
-
-          # log the error by default
-          Emque::Consuming.logger.error("Error consuming message #{e}")
-          Emque::Consuming.logger.error(context)
-          Emque::Consuming.logger.error e.backtrace.join("\n") unless e.backtrace.nil?
-
-          Emque::Consuming.config.error_handlers.each do |handler|
-            handler.call(e, context)
-          end
-
-          Emque::Consuming.application.instance.notice_error(context)
-        end
       end
     end
   end

data/lib/emque/consuming/version.rb

@@ -1,5 +1,5 @@
 module Emque
   module Consuming
-    VERSION = "1.4.0"
+    VERSION = "1.8.0"
   end
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: emque-consuming
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Ryan Williams
 - Dan Matthews
+- Paul Hanyzewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-21 00:00:00.000000000 Z
+date: 2020-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -73,28 +74,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '3.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: pipe-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: inflecto
   requirement: !ruby/object:Gem::Requirement
@@ -127,16 +128,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -289,8 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Microservices framework for Ruby