rocketjob 3.0.0.alpha → 3.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 328cd371a61e647e687589d126b222c603dfe3a0
-  data.tar.gz: c13d9c10d2156acbacbf92b05af835639c15b112
+  metadata.gz: dd04a62d8fb3d214ff56c777828061bf9f0e6453
+  data.tar.gz: 2d86b6a765140aac78ad0083514689c2f1d0ab4f
 SHA512:
-  metadata.gz: bb17eef819ef602e0d58fd89546495ac6f080e803c8421511be078e6821f9500860e40443120f417710cd1313e8e0fd329328c4cdcc0ace6ce4056aa7ab9703f
-  data.tar.gz: 74691dda4d998f54208a5ee3edbb004f49b078dd9f6d9d003b4795b654999aa292986fc36041aca282bca22f5b3b70d45e8a15e55323ebad602195b0d47a4e32
+  metadata.gz: de693c53a87019be64dddcde01944eeacf37c0bbc1229130927bb70307a42656c393acc65bc0a0f57045a4b8ba91bd3020ae828a0ab8e980f7bac49215c4b723
+  data.tar.gz: 3f9327e7d49bfac112788b331fb532a55d6bd748f66cbccf43f08d75d1a3412168e2a62182cb354c4648605b349d619a412b41f37231294bd1101328491196b9

data/lib/rocket_job/jobs/housekeeping_job.rb

@@ -15,39 +15,39 @@ module RocketJob
     #     aborted_retention:   7.days,
     #     completed_retention: 7.days,
     #     failed_retention:    14.days,
-    #     paused_retention:    90.days,
+    #     paused_retention:    nil,
     #     queued_retention:    nil
     #   )
     #
-    # Example, overriding defaults and disabling removal of paused jobs:
+    # Example, overriding defaults and disabling removal of failed jobs:
     #   RocketJob::Jobs::HousekeepingJob.create!(
     #     aborted_retention:   1.day,
-    #     completed_retention: 12.hours,
-    #     failed_retention:    7.days,
-    #     paused_retention:    nil
+    #     completed_retention: 30.minutes,
+    #     failed_retention:    nil
     #   )
     class HousekeepingJob < RocketJob::Job
       include RocketJob::Plugins::Cron
       include RocketJob::Plugins::Singleton
 
-      self.priority      = 50
+      self.priority      = 25
       self.description   = 'Cleans out historical jobs'
-      self.cron_schedule = '0 0 * * * America/New_York'
+      # Runs hourly on the hour
+      self.cron_schedule = '0 * * * * America/New_York'
 
       # Retention intervals in seconds
       # Set to nil to not
-      field :aborted_retention, Integer, default: 7.days
-      field :completed_retention, Integer, default: 7.days
-      field :failed_retention, Integer, default: 14.days
-      field :paused_retention, Integer, default: 90.days
-      field :queued_retention, Integer
+      field :aborted_retention, type: Integer, default: 7.days
+      field :completed_retention, type: Integer, default: 7.days
+      field :failed_retention, type: Integer, default: 14.days
+      field :paused_retention, type: Integer
+      field :queued_retention, type: Integer
 
       def perform
-        RocketJob::Job.aborted.where(created_at: {'$lte' => aborted_retention.ago}).destroy_all if aborted_retention
-        RocketJob::Job.completed.where(created_at: {'$lte' => completed_retention.ago}).destroy_all if completed_retention
-        RocketJob::Job.failed.where(created_at: {'$lte' => failed_retention.ago}).destroy_all if failed_retention
-        RocketJob::Job.paused.where(created_at: {'$lte' => paused_retention.ago}).destroy_all if paused_retention
-        RocketJob::Job.queued.where(created_at: {'$lte' => queued_retention.ago}).destroy_all if queued_retention
+        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.queued.where(created_at: {'$lte' => queued_retention.seconds.ago}).destroy_all if queued_retention
       end
 
     end

data/lib/rocket_job/plugins/job/model.rb

@@ -46,7 +46,7 @@ module RocketJob
           # Can be used to reduce log noise, especially during high volume calls
           # For debugging a single job can be logged at a low level such as :trace
           #   Levels supported: :trace, :debug, :info, :warn, :error, :fatal
-          field :log_level, type: Symbol, user_editable: true
+          field :log_level, type: Symbol, class_attribute: true, user_editable: true
 
           #
           # Read-only attributes

data/lib/rocket_job/plugins/restart.rb

@@ -27,6 +27,15 @@ module RocketJob
         after_fail :rocket_job_restart_abort
       end
 
+      module ClassMethods
+        def field(name, options)
+          if options.delete(:copy_on_restart) == false
+            self.rocket_job_restart_excludes += [name.to_sym] unless rocket_job_restart_excludes.include?(name.to_sym)
+          end
+          super(name, options)
+        end
+      end
+
       private
 
       # Run again in the future, even if this run fails with an exception

data/lib/rocket_job/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module RocketJob #:nodoc
-  VERSION = '3.0.0.alpha'
+  VERSION = '3.0.0.beta'
 end

data/lib/rocketjob.rb

@@ -41,6 +41,7 @@ module RocketJob
 
   module Jobs
     autoload :DirmonJob,        'rocket_job/jobs/dirmon_job'
+    autoload :HousekeepingJob,  'rocket_job/jobs/housekeeping_job'
     autoload :SimpleJob,        'rocket_job/jobs/simple_job'
   end
 

data/test/dirmon_job_test.rb

@@ -3,7 +3,7 @@ require_relative 'test_helper'
 # Unit Test for RocketJob::Job
 class DirmonJobTest < Minitest::Test
   class DirmonTestJob < RocketJob::Job
-    def perform(hash)
+    def perform
       3645
     end
   end

data/test/jobs/housekeeping_job_test.rb

@@ -0,0 +1,59 @@
+require_relative '../test_helper'
+
+# Unit Test for RocketJob::Job
+class HousekeepingJobTest < Minitest::Test
+  class TestJob < RocketJob::Job
+    def perform
+    end
+  end
+
+  describe RocketJob::Jobs::HousekeepingJob do
+    before do
+      HousekeepingJobTest::TestJob.delete_all
+      RocketJob::Jobs::HousekeepingJob.delete_all
+
+      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(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(created_at: 2.days.ago)
+      job.fail!
+      job = HousekeepingJobTest::TestJob.new(created_at: 15.days.ago)
+      job.fail!
+
+      job = HousekeepingJobTest::TestJob.new(created_at: 400.days.ago)
+      job.pause!
+      job = HousekeepingJobTest::TestJob.new
+      job.pause!
+
+      HousekeepingJobTest::TestJob.create!(created_at: 15.days.ago)
+      HousekeepingJobTest::TestJob.create!
+
+      assert_equal 10, HousekeepingJobTest::TestJob.count, -> { HousekeepingJobTest::TestJob.all.to_a.ai }
+    end
+
+    after do
+      @job.destroy if @job && !@job.new_record?
+    end
+
+    describe 'perform' do
+      it 'destroys jobs' do
+        @job = RocketJob::Jobs::HousekeepingJob.new
+        @job.perform_now
+        assert_equal 1, HousekeepingJobTest::TestJob.aborted.count, -> { HousekeepingJobTest::TestJob.aborted.to_a.ai }
+        assert_equal 1, HousekeepingJobTest::TestJob.completed.count, -> { HousekeepingJobTest::TestJob.completed.to_a.ai }
+        assert_equal 1, HousekeepingJobTest::TestJob.failed.count, -> { HousekeepingJobTest::TestJob.failed.to_a.ai }
+        assert_equal 2, HousekeepingJobTest::TestJob.paused.count, -> { HousekeepingJobTest::TestJob.paused.to_a.ai }
+        assert_equal 2, HousekeepingJobTest::TestJob.queued.count, -> { HousekeepingJobTest::TestJob.queued.to_a.ai }
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha
+  version: 3.0.0.beta
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-27 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -119,6 +119,7 @@ files:
 - test/dirmon_job_test.rb
 - test/files/text.txt
 - test/job_test.rb
+- test/jobs/housekeeping_job_test.rb
 - test/plugins/cron_test.rb
 - test/plugins/job/callbacks_test.rb
 - test/plugins/job/defaults_test.rb
@@ -164,6 +165,7 @@ test_files:
 - test/dirmon_job_test.rb
 - test/files/text.txt
 - test/job_test.rb
+- test/jobs/housekeeping_job_test.rb
 - test/plugins/cron_test.rb
 - test/plugins/job/callbacks_test.rb
 - test/plugins/job/defaults_test.rb