emque-consuming 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: bd761adf7f6566312a595dc7daeabb177df4bc66a0fa8eba94aca0fc0f2bda12
-  data.tar.gz: a2b0e6f4d089df133d0df082e36bb7fe54318813d348cdeb94af3f06ec6772d1
+SHA1:
+  metadata.gz: a7cb13ff862f06e20c37a2ab24e63d27bae8a7bc
+  data.tar.gz: 20d04ac78c5f6898997b777a13fc41dfedf7e52d
 SHA512:
-  metadata.gz: e2d8e044f5507502fbc4f58263c78d50840a3ac95f187bd780328b2a206fdd1ba74f13283d28c09184ba0df00924b24a47d6bb07bdc4975ef540ca467240927f
-  data.tar.gz: f790e603dafdf50498496651ac226b211b3071064cfec902ba66be54d35b3e3824b56e281a1c2f22962fdfbfda1457d873b2a5657e5db439d1f9ca42467eec03
+  metadata.gz: 409d9bb814d8c61640b9ae466a60c2b1cf87e59373430cb14e566060420171e6ec68b4fdfe9bd723d4b6c52957151007670b88e4717db1791c0eb62916cb91ef
+  data.tar.gz: b253f6405bfc98ad0ce91cd9a93767bd10d6033a8203ff30b56569c83398c3b943df7a1ed5c088bcc4c283d1853a76ee65b90a3a5415fc18b27f1b8f8e774012

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 rvm:
   - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
 script: bundle exec rake
 notifications:
   recipients:

data/CHANGELOG.md

@@ -1,5 +1,6 @@
 # Emque Consuming CHANGELOG
 
+- [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

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}
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "oj",        "~> 2.18.5"
   spec.add_dependency "virtus",    "~> 1.0"
   spec.add_dependency "puma",      "~> 3.12"
-  spec.add_dependency "pipe-ruby", "~> 0.2.0"
+  spec.add_dependency "pipe-ruby", "~> 1.0"
   spec.add_dependency "inflecto",  "~> 0.0.2"
 
   spec.add_development_dependency "bundler", "~> 1.7"

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 => true,
             :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.6.1"
+    VERSION = "1.7.0"
   end
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: emque-consuming
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Ryan Williams
 - Dan Matthews
+- Paul Hanyzewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2020-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -87,14 +88,14 @@ dependencies:
     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
@@ -289,7 +290,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Microservices framework for Ruby