subservient 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e6dc9fb826381c68f4d1f9f7f04f40e0dfb3a46
-  data.tar.gz: ced144a849ef9933b5b760c39f68c8c6d357ea48
+  metadata.gz: 0534f1615f5921685feaa774888040ee1e390b1e
+  data.tar.gz: 34abe0e7a3e55f57652801b9decb2a0c4793d4e8
 SHA512:
-  metadata.gz: c85bf058fd785ad5ebf06c0001d7409910931478787ff35f2cceaf857a271ad9470bddfd4c7a1e1c4df55d8cd50295bb55756c7664caedbf7f7afea228a02a71
-  data.tar.gz: 650f9a4bebac9ace6a6e75fb55cfb06561948d8dab7b55bf32a30997638e7f512946bf32614842f9a98c3270e983ca0c75dba398dead29d01f9218c363204ae2
+  metadata.gz: c0ffeb6ea489694dbcde6d020ea94fb0a31cb407f4bff0e75223ebaaab3b821e56a187816395d3743d5e27ac7a3eb9398b62a08212981d05a79ad610281717ce
+  data.tar.gz: 090a42d423687f5994b4f12b93651b7f2ca66670656813946908f4e992d0bf3e7e191858385ba467e5eba6be313381794ee8f78ac8078ee975a10d3ee1f06e0d

data/lib/subservient/errors.rb

@@ -9,6 +9,13 @@ module Subservient
   class MissingTaskError    < JobError;         end # Raised if task cannot be found
 
   class TaskError           < SubservientError; end # Never raised directly
-  class RetryJob            < TaskError;        end # Raised to retry a job
+  class RetryJob            < TaskError;            # Raised to retry a job
+    attr_accessible :max_retries
+    def initialize(max_retries=nil)
+      @max_retries = max_retries
+    end
+  end
   class BuryJob             < TaskError;        end # Raised to bury a job
+
+
 end

data/lib/subservient/job.rb

@@ -22,7 +22,22 @@ module Subservient
     end
 
     def execute
+      @bs_job.delete
       @task.execute_job
+    rescue RetryJob => e
+      if e.max_retries and e.max_retries < @bs_job.stats.retries
+        puts "#{e.inspect} - RELEASING JOB #{@job.bs_job.id}"
+        puts e.backtrace
+        @bs_job.release
+      else
+        puts "#{e.inspect} - BURYING JOB (EXCEEDED MAX RETRIES) #{@job.bs_job.id}"
+        puts e.backtrace
+        @bs_job.bury
+      end
+    rescue BuryJob => e
+      puts "#{e.inspect} - BURYING JOB #{@job.bs_job.id}"
+      puts e.backtrace
+      @bs_job.bury
     end
 
   end

data/lib/subservient/task.rb

@@ -5,22 +5,20 @@ module Subservient
     attr_reader :job
     def initialize job
       @job = job
+      @input = @job.input
     end
 
     def execute_job
       self.send(@job.task_method)
-      @job.bs_job.delete
     rescue NoMethodError
       raise MissingTaskError
+    rescue *@@retry_on => e
+      raise RetryJob.new @@max_retries
     rescue RetryJob, *@@retry_on => e
-      raise BuryJob if @job.bs_job.stats.releases > @@max_retries
-      puts "#{e.inspect} - RELEASING JOB #{@job.bs_job.id}"
-      puts e.backtrace
-      @job.bs_job.release
-    rescue BuryJob, StandardError => e
-      puts "#{e.inspect} - BURYING JOB #{@job.bs_job.id}"
-      puts e.backtrace
-      @job.bs_job.bury
+      e.max_retries ||= @@max_retries
+      raise e
+    rescue StandardError => e
+      raise BuryJob
     end
 
     private

data/lib/subservient/version.rb

@@ -1,3 +1,3 @@
 module Subservient
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subservient
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - David Robertson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaneater