sneakers 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 681e186272e780e4a969428ad17b2cef7e2f2a17
-  data.tar.gz: e26f11fd1c1282784a2b362d8e263f7b54cb9790
+  metadata.gz: 1e8f7e984a402f29c32f62b919a5ba0be9db25c1
+  data.tar.gz: 9502698889301eacdfa4fa94d9b7ae575e407ca7
 SHA512:
-  metadata.gz: 33b0a1d5f160771d38b3a8613a8f5b6022709bd1188e73cf2258a130389769bbec744867c76663182b737177718116ed88742e9a61285e61b3b3e4c99ebe2187
-  data.tar.gz: a6d4f4c557c7af9a01863b9b95ab3fd02bf4cb0a6670fe15dcd2e3c0f152839b0dba5a52b67271a83be1044f9b8e80a513f4f365343cc254ee5fb1ab22882719
+  metadata.gz: 842cabff8a0f3c2375533061b32a665d9e81102e53fee32eceb96f14d3126c78499a29e80efb0f247b10ed4de9fdb52f8aea57e7ccf65a7641ac020a28ab804c
+  data.tar.gz: 17e5b565b4162c7bbf4ddeffc8801309291c00684fe1c13914b0bae64bc81dce50772ce9874971cdabee462afe506a10b99f751636fc38d0ddc8e13080813ad9

data/lib/sneakers.rb

@@ -12,6 +12,7 @@ module Sneakers
 end
 
 require 'sneakers/configuration'
+require 'sneakers/errors'
 require 'sneakers/support/production_formatter'
 require 'sneakers/concerns/logging'
 require 'sneakers/concerns/metrics'

data/lib/sneakers/errors.rb

@@ -0,0 +1,5 @@
+require 'timeout'
+
+module Sneakers
+  class WorkerTimeout < Timeout::Error; end
+end

data/lib/sneakers/handlers/maxretry.rb

@@ -46,6 +46,7 @@ module Sneakers
         retry_name = @opts[:retry_exchange] || "#{@worker_queue_name}-retry"
         error_name = @opts[:retry_error_exchange] || "#{@worker_queue_name}-error"
         requeue_name = @opts[:retry_requeue_exchange] || "#{@worker_queue_name}-retry-requeue"
+        retry_routing_key = @opts[:retry_routing_key] || "#"
 
         # Create the exchanges
         @retry_exchange, @error_exchange, @requeue_exchange = [retry_name, error_name, requeue_name].map do |name|
@@ -75,7 +76,7 @@ module Sneakers
         @error_queue.bind(@error_exchange, :routing_key => '#')
 
         # Finally, bind the worker queue to our requeue exchange
-        queue.bind(@requeue_exchange, :routing_key => '#')
+        queue.bind(@requeue_exchange, :routing_key => retry_routing_key)
 
         @max_retries = @opts[:retry_max_times] || 5
 
@@ -137,7 +138,8 @@ module Sneakers
             error: reason,
             num_attempts: num_attempts,
             failed_at: Time.now.iso8601,
-            payload: Base64.encode64(msg.to_s)
+            payload: Base64.encode64(msg.to_s),
+            properties: Base64.encode64(props.to_json)
           }.tap do |hash|
             if reason.is_a?(Exception)
               hash[:error_class] = reason.class.to_s

data/lib/sneakers/version.rb

@@ -1,3 +1,3 @@
 module Sneakers
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
 end

data/lib/sneakers/worker.rb

@@ -51,7 +51,7 @@ module Sneakers
 
         begin
           metrics.increment("work.#{self.class.name}.started")
-          Timeout.timeout(@timeout_after, Timeout::Error) do
+          Timeout.timeout(@timeout_after, WorkerTimeout) do
             metrics.timing("work.#{self.class.name}.time") do
               if @call_with_params
                 res = work_with_params(msg, delivery_info, metadata)
@@ -60,13 +60,15 @@ module Sneakers
               end
             end
           end
-        rescue Timeout::Error => ex
+        rescue WorkerTimeout => ex
           res = :timeout
-          worker_error(ex, log_msg: log_msg(msg), message: msg)
+          worker_error(ex, log_msg: log_msg(msg), class: self.class.name,
+                       message: msg, delivery_info: delivery_info, metadata: metadata)
         rescue => ex
           res = :error
           error = ex
-          worker_error(ex, log_msg: log_msg(msg), message: msg)
+          worker_error(ex, log_msg: log_msg(msg), class: self.class.name,
+                       message: msg, delivery_info: delivery_info, metadata: metadata)
         end
 
         if @should_ack
@@ -131,8 +133,11 @@ module Sneakers
         @queue_opts = opts
       end
 
-      def enqueue(msg)
-        publisher.publish(msg, :to_queue => @queue_name)
+      def enqueue(msg, opts={})
+        opts[:routing_key] ||= @queue_opts[:routing_key]
+        opts[:to_queue] ||= @queue_name
+
+        publisher.publish(msg, opts)
       end
 
       private

data/sneakers.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(/^(test|spec|features)\//)
   gem.require_paths = ['lib']
   gem.add_dependency 'serverengine', '~> 1.5.11'
-  gem.add_dependency 'bunny', '~> 2.6'
+  gem.add_dependency 'bunny', '~> 2.6.4'
   gem.add_dependency 'thread', '~> 0.1.7'
   gem.add_dependency 'thor'
 

data/spec/sneakers/worker_handlers_spec.rb

@@ -252,6 +252,7 @@ describe 'Handlers' do
             data['error'].must_equal('reject')
             data['num_attempts'].must_equal(2)
             data['payload'].must_equal(Base64.encode64(:reject.to_s))
+            data['properties'].must_equal(Base64.encode64(@props_with_x_death.to_json))
             Time.parse(data['failed_at']).wont_be_nil
           end
 
@@ -267,6 +268,7 @@ describe 'Handlers' do
             data['error'].must_equal('reject')
             data['num_attempts'].must_equal(4)
             data['payload'].must_equal(Base64.encode64(:reject.to_s))
+            data['properties'].must_equal(Base64.encode64(props_with_x_death_count.to_json))
             Time.parse(data['failed_at']).wont_be_nil
           end
 
@@ -316,6 +318,7 @@ describe 'Handlers' do
             data['error'].must_equal('timeout')
             data['num_attempts'].must_equal(2)
             data['payload'].must_equal(Base64.encode64(:timeout.to_s))
+            data['properties'].must_equal(Base64.encode64(@props_with_x_death.to_json))
             Time.parse(data['failed_at']).wont_be_nil
           end
         end
@@ -347,6 +350,7 @@ describe 'Handlers' do
             data['backtrace'].wont_be_nil
             data['num_attempts'].must_equal(2)
             data['payload'].must_equal(Base64.encode64('boom!'))
+            data['properties'].must_equal(Base64.encode64(@props_with_x_death.to_json))
             Time.parse(data['failed_at']).wont_be_nil
           end
         end
@@ -383,6 +387,7 @@ describe 'Handlers' do
           data['error'].must_equal('timeout')
           data['num_attempts'].must_equal(2)
           data['payload'].must_equal(Base64.encode64(payload.to_json))
+          data['properties'].must_equal(Base64.encode64(@props_with_x_death.to_json))
         end
 
       end

data/spec/sneakers/worker_spec.rb

@@ -159,19 +159,16 @@ describe Sneakers::Worker do
 
   describe ".enqueue" do
     it "publishes a message to the class queue" do
-      message = "my message"
-      mock = MiniTest::Mock.new
+      message = 'test message'
 
-      mock.expect(:publish, true) do |msg, opts|
-        msg.must_equal(message)
-        opts.must_equal(:to_queue => "defaults")
+      mock(Sneakers::Publisher).new(DummyWorker.queue_opts) do
+        mock(Object.new).publish(message, {
+          :routing_key => 'test.routing.key',
+          :to_queue    => 'downloads'
+        })
       end
-    end
 
-    it "passes the configuration to the publisher" do
-      opts = DummyWorker.queue_opts
-      mock(Sneakers::Publisher).new(opts) { mock(Object.new).publish(anything, anything) }
-      DummyWorker.enqueue(message)
+      DummyWorker.enqueue(message, :routing_key => 'test.routing.key')
     end
   end
 
@@ -361,7 +358,7 @@ describe Sneakers::Worker do
       header = Object.new
 
       mock(handler).timeout(header, nil, "msg")
-      mock(w.logger).error(/error="execution expired" error_class=Timeout::Error backtrace=/)
+      mock(w.logger).error(/error="execution expired" error_class=Sneakers::WorkerTimeout backtrace=/)
 
       w.do_work(header, nil, "msg", handler)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sneakers
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Dotan Nahum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serverengine
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: 2.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: 2.6.4
 - !ruby/object:Gem::Dependency
   name: thread
   requirement: !ruby/object:Gem::Requirement
@@ -268,6 +268,7 @@ files:
 - lib/sneakers/concerns/metrics.rb
 - lib/sneakers/configuration.rb
 - lib/sneakers/error_reporter.rb
+- lib/sneakers/errors.rb
 - lib/sneakers/handlers/maxretry.rb
 - lib/sneakers/handlers/oneshot.rb
 - lib/sneakers/metrics/logging_metrics.rb
@@ -321,7 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Fast background processing framework for Ruby and RabbitMQ