kestrel-client 0.5.2 → 0.5.3

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/kestrel-client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kestrel-client}
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Freels", "Rael Dornfest"]
-  s.date = %q{2010-09-30}
+  s.date = %q{2010-10-05}
   s.description = %q{Ruby client for the Kestrel queue server}
   s.email = %q{rael@twitter.com}
   s.extra_rdoc_files = [

data/lib/kestrel/client/transactional.rb

@@ -4,22 +4,14 @@ class Kestrel::Client::Transactional < Kestrel::Client::Proxy
   # multiple queues.
   class MultipleQueueException < StandardError; end
 
-
   class RetryableJob < Struct.new(:retries, :job); end
 
-
   # Number of times to retry a job before giving up
   DEFAULT_RETRIES = 100
 
-
   # Pct. of the time during 'normal' processing we check the error queue first
   ERROR_PROCESSING_RATE = 0.1
 
-
-  # Maximum number of gets to execute before switching servers
-  MAX_PER_SERVER = 100_000
-
-
   # ==== Parameters
   # client<Kestrel::Client>:: Client
   # max_retries<Integer>:: Number of times to retry a job before
@@ -31,10 +23,9 @@ class Kestrel::Client::Transactional < Kestrel::Client::Proxy
   #                       single server, before changing
   #                       servers. Defaults to MAX_PER_SERVER
   #
-  def initialize(client, max_retries = nil, error_rate = nil, per_server = nil)
+  def initialize(client, max_retries = nil, error_rate = nil)
     @max_retries = max_retries || DEFAULT_RETRIES
     @error_rate  = error_rate || ERROR_PROCESSING_RATE
-    @per_server  = per_server || MAX_PER_SERVER
     @counter     = 0 # Command counter
     super(client)
   end
@@ -77,17 +68,25 @@ class Kestrel::Client::Transactional < Kestrel::Client::Proxy
   # ==== Returns
   # Boolean:: true if the job is retryable, false otherwise
   #
-  def retry
-    return unless @job
+  def retry(item = nil)
+    job =
+      if item
+        current_retries = (@job ?  @job.retries : 0)
+        RetryableJob.new(current_retries, item)
+      else
+        @job
+      end
+
+    return unless job
 
-    @job.retries += 1
+    job.retries += 1
 
-    if should_retry = @job.retries < @max_retries
-      client.set(current_queue + "_errors", @job)
+    if should_retry = job.retries < @max_retries
+      client.set(current_queue + "_errors", job)
     end
 
     # close the transaction on the original queue if this is the first retry
-    close_transaction(@job.retries == 1 ? current_queue : "#{current_queue}_errors")
+    close_transaction(job.retries == 1 ? current_queue : "#{current_queue}_errors")
 
     should_retry
   end

data/spec/kestrel/client/transactional_spec.rb

@@ -4,7 +4,7 @@ describe "Kestrel::Client::Transactional" do
   describe "Instance Methods" do
     before do
       @raw_kestrel_client = Kestrel::Client.new(*Kestrel::Config.default)
-      @kestrel = Kestrel::Client::Transactional.new(@raw_kestrel_client, nil, nil, 1)
+      @kestrel = Kestrel::Client::Transactional.new(@raw_kestrel_client)
       stub(@kestrel).rand { 1 }
       @queue = "some_queue"
     end
@@ -128,6 +128,14 @@ describe "Kestrel::Client::Transactional" do
         @kestrel.retry.should be_true
       end
 
+      it "allows specification of the job to retry" do
+        mock(@raw_kestrel_client).set(@queue + "_errors", anything) do |queue, job|
+          job.retries.should == 1
+          job.job.should == :revised_mcmuffin
+        end
+        @kestrel.retry(:revised_mcmuffin).should be_true
+      end
+
       it "increments the retry count and re-enqueues the retried job" do
         stub(@kestrel).rand { 0 }
         stub(@raw_kestrel_client).get(@queue + "_errors", anything) do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kestrel-client
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Matt Freels
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 -07:00
+date: 2010-10-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency