sneakers 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec56c8e9d5a17b77884550db383bd199027c6df5
-  data.tar.gz: 057d82d280432901949988868f0643958cd26ec4
+  metadata.gz: 840d0c4111ae6ab4c2b97719597fa928632dd34b
+  data.tar.gz: f24a305085c2b43bee74922011ffd3daf5031d24
 SHA512:
-  metadata.gz: 9d57c46bf38eb2bbb9752cc4fdc14d2de9ff9abdd9cf5d32a5a9a89c68e62d1884ccff6ba9c46eae106ea02c30ed2b4f8faffe8d3e69a1527ba395b3c0a2663a
-  data.tar.gz: f31f033a8fb2173632e16f7bd2ac73d6e6572270e8c77cc6f3d8dd3510ae63cd02bd241d6609c488a5dbb93ecc34d1d66653985e1e7895265c185ef92f7fd10f
+  metadata.gz: 936db286d2c0638746771efa54c4bdc8cee4f78c641bdc38db42eaa8fad7bed13428223ac6988edcc10f9a5c883a28c054aeb7d4c842f4befcbc24654014c274
+  data.tar.gz: 426cf688b5e91c2e02bcb4c45fe420989592c6041419e0bf1cd8d4ae59b145426164ab669e17ac6e620481dc7734c798fcb53cb1d5c8e2ad1dc42c54f2881998

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-- 2.2.0
-- 2.1.0
+- 2.2
+- 2.1
 - 2.0.0
 - 1.9.3

data/lib/sneakers/handlers/maxretry.rb

@@ -165,9 +165,16 @@ module Sneakers
         if headers.nil? || headers['x-death'].nil?
           0
         else
-          headers['x-death'].select do |x_death|
+          x_death_array = headers['x-death'].select do |x_death|
             x_death['queue'] == @worker_queue_name
-          end.count
+          end
+          if x_death_array.count > 0 && x_death_array.first['count']
+            # Newer versions of RabbitMQ return headers with a count key
+            x_death_array.inject(0) {|sum, x_death| sum + x_death['count']}
+          else
+            # Older versions return a separate x-death header for each failure
+            x_death_array.count
+          end
         end
       end
       private :failure_count

data/lib/sneakers/publisher.rb

@@ -15,10 +15,10 @@ module Sneakers
       @exchange.publish(msg, options)
     end
 
-    private
 
     attr_reader :exchange
 
+  private
     def ensure_connection!
       @bunny = Bunny.new(@opts[:amqp], heartbeat: @opts[:heartbeat], vhost: @opts[:vhost], :logger => Sneakers::logger)
       @bunny.start

data/lib/sneakers/queue.rb

@@ -46,7 +46,7 @@ class Sneakers::Queue
     # has the same configuration as the worker. Also pass along the exchange and
     # queue in case the handler requires access to them (for things like binding
     # retry queues, etc).
-    handler_klass = worker.opts[:handler] || Sneakers::CONFIG[:handler]
+    handler_klass = worker.opts[:handler] || Sneakers::CONFIG.fetch(:handler)
     handler = handler_klass.new(@channel, queue, worker.opts)
 
     @consumer = queue.subscribe(:block => false, :manual_ack => @opts[:ack]) do | delivery_info, metadata, msg |

data/lib/sneakers/runner.rb

@@ -64,8 +64,15 @@ module Sneakers
     end
 
   private
-    def make_serverengine_config
+  def make_serverengine_config
+      # From Sneakers#setup_general_logger, there's support for a Logger object
+      # in CONFIG[:log].  However, serverengine takes an object in :logger.
+      # Pass our logger object so there's no issue about sometimes passing a
+      # file and sometimes an object.
+      without_log = Sneakers::CONFIG.merge(@conf)
+      without_log.delete(:log)
       Sneakers::CONFIG.merge(@conf).merge({
+        :logger => Sneakers.logger,
         :worker_type => 'process',
         :worker_classes => @worker_classes
       })

data/lib/sneakers/version.rb

@@ -1,3 +1,3 @@
 module Sneakers
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/sneakers.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.add_dependency 'serverengine', '~> 1.5.5'
   gem.add_dependency 'bunny', '~> 1.7.0'
-  gem.add_dependency 'thread', '0.1.5'
+  gem.add_dependency 'thread', '~> 0.1.7'
   gem.add_dependency 'thor'
 
   gem.add_development_dependency 'rr'

data/spec/sneakers/queue_spec.rb

@@ -4,10 +4,6 @@ require 'sneakers'
 
 
 describe Sneakers::Queue do
-  before do
-    Sneakers.configure
-  end
-
   let :queue_vars do
     {
       :prefetch => 25,
@@ -21,6 +17,8 @@ describe Sneakers::Queue do
   end
 
   before do
+    Sneakers.configure
+
     @mkbunny = Object.new
     @mkchan = Object.new
     @mkex = Object.new

data/spec/sneakers/runner_spec.rb

@@ -0,0 +1,26 @@
+require 'logger'
+require 'spec_helper'
+require 'sneakers'
+
+describe Sneakers::Runner do
+  let(:logger) { Logger.new('logtest.log') }
+
+  describe "with configuration that specifies a logger object" do
+    before do
+      Sneakers.configure(log: logger)
+      @runner = Sneakers::Runner.new([])
+    end
+
+    it 'passes the logger to serverengine' do
+      # Stub out ServerEngine::Daemon.run so we only exercise the way we invoke
+      # ServerEngine.create
+      any_instance_of(ServerEngine::Daemon) do |daemon|
+        stub(daemon).main{ return 0 }
+      end
+
+      @runner.run
+      # look at @runner's @se instance variable (actually of type Daemon)...and
+      # figure out what it's logger is...
+    end
+  end
+end

data/spec/sneakers/worker_handlers_spec.rb

@@ -103,6 +103,31 @@ describe 'Handlers' do
 
   describe 'Maxretry' do
     let(:max_retries) { nil }
+    let(:props_with_x_death_count) {
+      {
+        :headers => {
+          "x-death" => [
+                        {
+                          "count" => 3,
+                          "reason" => "expired",
+                          "queue" => "downloads-retry",
+                          "time" => Time.now,
+                          "exchange" => "RawMail-retry",
+                          "routing-keys" => ["RawMail"]
+                        },
+                        {
+                          "count" => 3,
+                          "reason" => "rejected",
+                          "queue" => "downloads",
+                          "time" => Time.now,
+                          "exchange" => "",
+                          "routing-keys" => ["RawMail"]
+                        }
+                       ]
+        },
+        :delivery_mode => 1
+      }
+    }
 
     before(:each) do
       @opts = {
@@ -228,6 +253,21 @@ describe 'Handlers' do
             Time.parse(data['failed_at']).wont_be_nil
           end
 
+          it 'counts the number of attempts using the count key' do
+            mock(@header).routing_key { '#' }
+            mock(channel).acknowledge(37, false)
+
+            @error_exchange.extend MockPublish
+            worker.do_work(@header, props_with_x_death_count, :reject, @handler)
+            @error_exchange.called.must_equal(true)
+            @error_exchange.opts.must_equal({ :routing_key => '#' })
+            data = JSON.parse(@error_exchange.data)
+            data['error'].must_equal('reject')
+            data['num_attempts'].must_equal(4)
+            data['payload'].must_equal(Base64.encode64(:reject.to_s))
+            Time.parse(data['failed_at']).wont_be_nil
+          end
+
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sneakers
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Dotan Nahum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serverengine
@@ -42,16 +42,16 @@ dependencies:
   name: thread
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.7
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -261,6 +261,7 @@ files:
 - spec/sneakers/configuration_spec.rb
 - spec/sneakers/publisher_spec.rb
 - spec/sneakers/queue_spec.rb
+- spec/sneakers/runner_spec.rb
 - spec/sneakers/sneakers_spec.rb
 - spec/sneakers/support/utils_spec.rb
 - spec/sneakers/worker_handlers_spec.rb
@@ -297,6 +298,7 @@ test_files:
 - spec/sneakers/configuration_spec.rb
 - spec/sneakers/publisher_spec.rb
 - spec/sneakers/queue_spec.rb
+- spec/sneakers/runner_spec.rb
 - spec/sneakers/sneakers_spec.rb
 - spec/sneakers/support/utils_spec.rb
 - spec/sneakers/worker_handlers_spec.rb