rocketjob 3.4.2 → 3.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c3d286a7897bd81bef71df484490bca1c38ef45
-  data.tar.gz: '09e9db2779c746cd3b96bb72bbe44e9ad1ad6a7f'
+  metadata.gz: 72a9239aa38ba9581931c3bd6f1402278b3c9d41
+  data.tar.gz: aa360338a810a8853a463149084554978c57774f
 SHA512:
-  metadata.gz: c3eba8f0b893631984477714946fa3a89062e6d71d6f122511d36354e5fa2b558d3591ee7716408356084aaebc4e43ff03a8dbeeb74b3dfaa789eb43ae4c8188
-  data.tar.gz: 711e258fc7d726247f3252e3aea9a3f75407c978bb4f378300faf66fff8e3a9098273dc6eb68084591f6035ed5de37e7a3ba7f1c809a40b9be1945cc2c67a2cd
+  metadata.gz: 1ba33a298630312129bc76f34084e49a348e27bba34e6f452a7d990a0c96d800c664db58b04724503d2cdcdd944a3120ccf09e583661453fb93832d2d38458b3
+  data.tar.gz: f141cfbd428307638df1ac8ed20d00e345483370e6c4c40523d9409d2afc6f2d23b8c49d8b27c6eedac4aa72b48d6168dbfd1880b43cd20aaf452fdf223e4ce9

data/lib/rocket_job/jobs/housekeeping_job.rb

@@ -46,12 +46,17 @@ module RocketJob
       field :queued_retention, type: Integer, user_editable: true, copy_on_restart: true
 
       def perform
-        RocketJob::Server.destroy_zombies if destroy_zombies
+        if destroy_zombies
+          # Cleanup zombie servers
+          RocketJob::Server.destroy_zombies
+          # Requeue jobs where the worker is in the zombie state and its server has gone away
+          RocketJob::ActiveWorker.requeue_zombies
+        end
 
-        RocketJob::Job.aborted.where(created_at: {'$lte' => aborted_retention.seconds.ago}).destroy_all if aborted_retention
-        RocketJob::Job.completed.where(created_at: {'$lte' => completed_retention.seconds.ago}).destroy_all if completed_retention
-        RocketJob::Job.failed.where(created_at: {'$lte' => failed_retention.seconds.ago}).destroy_all if failed_retention
-        RocketJob::Job.paused.where(created_at: {'$lte' => paused_retention.seconds.ago}).destroy_all if paused_retention
+        RocketJob::Job.aborted.where(completed_at: {'$lte' => aborted_retention.seconds.ago}).destroy_all if aborted_retention
+        RocketJob::Job.completed.where(completed_at: {'$lte' => completed_retention.seconds.ago}).destroy_all if completed_retention
+        RocketJob::Job.failed.where(completed_at: {'$lte' => failed_retention.seconds.ago}).destroy_all if failed_retention
+        RocketJob::Job.paused.where(completed_at: {'$lte' => paused_retention.seconds.ago}).destroy_all if paused_retention
         RocketJob::Job.queued.where(created_at: {'$lte' => queued_retention.seconds.ago}).destroy_all if queued_retention
       end
 

data/lib/rocket_job/version.rb

@@ -1,3 +1,3 @@
 module RocketJob #:nodoc
-  VERSION = '3.4.2'
+  VERSION = '3.4.3'
 end

data/test/jobs/housekeeping_job_test.rb

@@ -16,25 +16,39 @@ class HousekeepingJobTest < Minitest::Test
 
     describe 'job retention' do
       before do
-        job = HousekeepingJobTest::TestJob.new(created_at: 2.days.ago)
-        job.abort!
-        job = HousekeepingJobTest::TestJob.new(created_at: 8.days.ago)
-        job.abort!
+        job = HousekeepingJobTest::TestJob.new
+        Time.stub(:now, 2.days.ago) do
+          job.abort!
+        end
+        job = HousekeepingJobTest::TestJob.new
+        Time.stub(:now, 8.days.ago) do
+          job.abort!
+        end
 
-        job = HousekeepingJobTest::TestJob.new(created_at: 2.days.ago)
-        job.perform_now
-        job.save!
-        job = HousekeepingJobTest::TestJob.new(created_at: 8.days.ago)
-        job.perform_now
-        job.save!
+        job = HousekeepingJobTest::TestJob.new
+        Time.stub(:now, 2.days.ago) do
+          job.perform_now
+          job.save!
+        end
+        job = HousekeepingJobTest::TestJob.new
+        Time.stub(:now, 8.days.ago) do
+          job.perform_now
+          job.save!
+        end
 
-        job = HousekeepingJobTest::TestJob.new(created_at: 2.days.ago)
-        job.fail!
-        job = HousekeepingJobTest::TestJob.new(created_at: 15.days.ago)
-        job.fail!
+        job = HousekeepingJobTest::TestJob.new
+        Time.stub(:now, 2.days.ago) do
+          job.fail!
+        end
+        job = HousekeepingJobTest::TestJob.new
+        Time.stub(:now, 15.days.ago) do
+          job.fail!
+        end
 
-        job = HousekeepingJobTest::TestJob.new(created_at: 400.days.ago)
-        job.pause!
+        job = HousekeepingJobTest::TestJob.new
+        Time.stub(:now, 400.days.ago) do
+          job.pause!
+        end
         job = HousekeepingJobTest::TestJob.new
         job.pause!
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.4.3
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby