coney_island 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 789d4484a6d12b8c9f16dca1f0c1c87930396a27
-  data.tar.gz: ffb7a60d798e6df10e85a1f7880d741fa5edf23d
+  metadata.gz: 8ace26e15f62cea555f90b2d01df1c171a663bdd
+  data.tar.gz: ac72a73cc54eef7b8ce0cf787bfd7cad67f7662c
 SHA512:
-  metadata.gz: 19efec101621324b22d48430e64fde74e0de32119e364b63780ab20c3618b68bdebb5dc24c9f6c17051f9f7c017a0c7f789e14af8c750b41a5e82ac8d81846aa
-  data.tar.gz: cf322ce204cf76588a5f827fec599c752f4e6d4b7c9d89391bc3d84f4b0d37201efcd05070924d0af21905be6c386f5d6d12e1c8c385bbedb71459c332a1a4e6
+  metadata.gz: d62459ea99bf7d992555add7bd1659aac5fd2422b94d8ad6c0e20b5802481857e5708445bdfe29e0beb41335225429bdbb9c88fe6952bf2530ecd5cdf15b8370
+  data.tar.gz: d7148fc33a739223600f3ba69e886c5054d011863b59304713d3933b7d2cd38a50e9943159ec8ca031fc6eb397f12af54eb6efa7be85d07d3bede9c8f4044f9f

data/lib/coney_island/job.rb

@@ -50,6 +50,7 @@ module ConeyIsland
     end
 
     def handle_job
+      ConeyIsland::Worker.running_jobs << self
       Timeout::timeout(timeout) do
         execute_job_method
       end
@@ -63,32 +64,67 @@ module ConeyIsland
         ConeyIsland.submit(self.klass, self.method_name, self.resubmit_args)
       end
     rescue Exception => e
+      log.error("Error executing #{self.class_name}##{self.method_name} #{self.id} for id #{self.instance_id} with args #{self.args}:")
+      log.error(e.message)
+      log.error(e.backtrace.join("\n"))
       if retry_on_exception && (self.attempts < self.retry_limit)
-        self.attempts += 1
         ConeyIsland.poke_the_badger(e, {work_queue: self.ticket, job_payload: self.args, attempt_count: self.attempts})
+        log.error("Resubmitting #{self.id} after error on attempt ##{self.attempts}")
+        self.attempts += 1
         ConeyIsland.submit(self.klass, self.method_name, self.resubmit_args)
-        log.error("Resubmitting after error on attempt ##{self.attempts}:")
       else
         ConeyIsland.poke_the_badger(e, {work_queue: self.ticket, job_payload: self.args})
-        log.error("Bailing out after error on final attempt ##{self.attempts}:")
+        log.error("Bailing out on #{self.id} after error on final attempt ##{self.attempts}:")
       end
-      log.error("Error executing #{self.class_name}##{self.method_name} #{self.id} for id #{self.instance_id} with args #{self.args}:")
-      log.error(e.message)
-      log.error(e.backtrace.join("\n"))
     ensure
       finalize_job
     end
 
+    def next_attempt_delay
+      if self.delaying?
+        time_delayed = (Time.now - self.delay_start).round
+        new_delay = self.delay - time_delayed
+      else
+        ConeyIsland.delay_seed**(self.attempts - 1)
+      end
+    end
+
     def resubmit_args
       args.select{|key,val| ['timeout','retry_on_exception','retry_limit','args','instance_id'].include? key}.merge(
-        'attempt_count' => self.attempts, 'work_queue' => self.ticket, 'delay' => ConeyIsland.delay_seed**(self.attempts - 1))
+        'attempt_count' => self.attempts, 'work_queue' => self.ticket, 'delay' => self.next_attempt_delay)
     end
 
     def finalize_job
-      metadata.ack unless ConeyIsland.running_inline?
+      metadata.ack if !self.acked? && !ConeyIsland.running_inline?
       log.info("finished job #{id}")
       ConeyIsland::Worker.running_jobs.delete self
     end
 
+    def delaying?
+      @delaying
+    end
+
+    def acked?
+      @acked
+    end
+
+    def activate_after_delay
+      @delaying = false
+      ConeyIsland::Worker.delayed_jobs.delete self
+    end
+
+    def delay_job
+      @delaying = true
+      ConeyIsland::Worker.delayed_jobs << self
+      unless ConeyIsland.running_inline?
+        @acked = true
+        metadata.ack
+      end
+      log.info("delaying job #{id} for #{self.delay} seconds")
+    end
+
+    def requeue_delay
+      ConeyIsland.submit(self.klass, self.method_name, self.resubmit_args)
+    end
   end
 end

data/lib/coney_island/version.rb

@@ -1,3 +1,3 @@
 module ConeyIsland
-  VERSION = "0.10.1"
+  VERSION = "0.10.2"
 end

data/lib/coney_island/worker.rb

@@ -25,6 +25,10 @@ module ConeyIsland
       @running_jobs = []
     end
 
+    def self.delayed_jobs
+      @delayed_jobs ||= []
+    end
+
     def self.ticket
       @ticket
     end
@@ -160,9 +164,11 @@ module ConeyIsland
       begin
         args = JSON.parse(payload)
         job = Job.new(metadata, args)
-        self.running_jobs << job
         if job.delay.present?
+          self.delayed_jobs << job
+          job.delay_job
           EventMachine.add_timer(job.delay) do
+            job.activate_after_delay
             job.handle_job
           end
         else
@@ -198,6 +204,9 @@ module ConeyIsland
         Process.kill(signal, child_pid)
       end
       @queue.unsubscribe rescue nil
+      self.delayed_jobs.each do |delayed_job|
+        delayed_job.requeue_delay
+      end
       EventMachine.add_periodic_timer(1) do
         if self.running_jobs.any?
           self.log.info("Waiting for #{self.running_jobs.length} requests to finish")

data/test/dummy/log/test.log

@@ -1,22 +1,12 @@
 ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
 Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
-Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
-ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
-Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
-ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
-Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
 ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
 Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
 ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
 Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
 ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
 Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
-ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
 Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
 ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
 Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
 ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
-ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
-Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
-ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
-Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...

data/test/job_test.rb

@@ -45,6 +45,7 @@ class JobTest < MiniTest::Test
       end
 
       it "bails out on timeout if retry limit reached" do
+        ConeyIsland.stop_running_inline
         job = ConeyIsland::Job.new(@metadata,
           { 'klass' => 'TestModel',
             'method_name' => :take_too_long,
@@ -79,6 +80,7 @@ class JobTest < MiniTest::Test
       end
 
       it "bails out on exception if retry_on_exception set and retry_limit reached" do
+        ConeyIsland.stop_running_inline
         job = ConeyIsland::Job.new(@metadata,
           { 'klass' => 'TestModel',
             'method_name' => :throw_an_error,
@@ -96,6 +98,7 @@ class JobTest < MiniTest::Test
       end
 
       it "bails out on exception if retry_on_exception not set" do
+        ConeyIsland.stop_running_inline
         job = ConeyIsland::Job.new(@metadata,
           { 'klass' => 'TestModel',
             'method_name' => :throw_an_error }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coney_island
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Eric Draut
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails