rocketjob 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0725e6ae6b369e365e609d97bd8ee41fe5e34966
-  data.tar.gz: 19a23fd15b27daad4767f4e560506857b71935b5
+  metadata.gz: 75e6c5434b4b1968db94743e4b81fcc0a68cabc3
+  data.tar.gz: 735b0996986532d05ee46c546df4033a2b0d3c95
 SHA512:
-  metadata.gz: 5d86348478486ad2acd418d55d82bf17c7a6ad2080f711f497a9d561cb23c7debf67b680d3d2546efa201070431dea98a53281be8ea88ff0053321c5ecee1f9b
-  data.tar.gz: 64fe3f0a32fef2122728edabf494964a3d77b76c51d360fbe8343d04e4afe93c3640a4d0bd051b323c761ab91bbcfdeb3da6465a7e15e9f1b05f41fa6c168939
+  metadata.gz: 0556e6e99fa676eaa9eea871b5c32ffa372794ad5358a16f1daa11f28e0739bfc7954760d00a1d1d358ad135dfcf88e08823cdd22957fc41a5fbeb47b71fd0bd
+  data.tar.gz: f780fa752304a93234e9dee155ab47a1949011c20d4a7cd2a949b068e0c65e195296a6edf7469d95af695d9c83d2f8041bcc3d53964fe2e71814d2a28dafeb5c

data/lib/rocket_job/dirmon_entry.rb

@@ -129,7 +129,7 @@ module RocketJob
     validates_presence_of :pattern, :job_class_name, :perform_method
 
     validates_each :perform_method do |record, attr, value|
-      if (klass = record.job_class) && !klass.instance_method(value)
+      if (klass = record.job_class) && !klass.instance_methods.include?(value)
         record.errors.add(attr, "Method not implemented by #{record.job_class_name}")
       end
     end
@@ -145,7 +145,7 @@ module RocketJob
     end
 
     validates_each :arguments do |record, attr, value|
-      if (klass = record.job_class)
+      if (klass = record.job_class) && klass.instance_methods.include?(record.perform_method)
         count = klass.argument_count(record.perform_method)
         record.errors.add(attr, "There must be #{count} argument(s)") if value.size != count
       end

data/lib/rocket_job/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module RocketJob #:nodoc
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/lib/rocket_job/worker.rb

@@ -117,11 +117,14 @@ module RocketJob
     # Destroy's all instances of zombie workers and requeues any jobs still "running"
     # on those workers
     def self.destroy_zombies
+      count = 0
       each do |worker|
-        next unless zombie?
+        next unless worker.zombie?
         logger.warn "Destroying zombie worker #{worker.name}, and requeueing its jobs"
         worker.destroy
+        count += 1
       end
+      count
     end
 
     def self.destroy_dead_workers
@@ -220,8 +223,9 @@ module RocketJob
     # - The worker process is "hanging"
     # - The worker is no longer able to communicate with the MongoDB Server
     def zombie?(missed = 4)
+      return false unless running?
       dead_seconds = Config.instance.heartbeat_seconds * missed
-      (Time.now - worker.heartbeat.updated_at) >= dead_seconds
+      (Time.now - heartbeat.updated_at) >= dead_seconds
     end
 
     protected

data/test/dirmon_entry_test.rb

@@ -97,6 +97,16 @@ class DirmonEntryTest < Minitest::Test
         assert_equal ["can't be blank"], entry.errors[:pattern], entry.errors.inspect
       end
 
+      context 'perform_method' do
+        context 'with an invalid method' do
+          should 'add errors to the entry' do
+            entry = RocketJob::DirmonEntry.new(job_class_name: 'Jobs::TestJob', perform_method: :missing_perform_method)
+            assert_equal false, entry.valid?
+            assert_equal ['Method not implemented by Jobs::TestJob'], entry.errors[:perform_method], entry.errors.inspect
+          end
+        end
+      end
+
       context 'job_class_name' do
         should 'ensure presence' do
           assert entry = RocketJob::DirmonEntry.new(pattern: '/abc/**')
@@ -106,6 +116,16 @@ class DirmonEntryTest < Minitest::Test
       end
 
       context 'arguments' do
+        should 'allow no arguments' do
+          assert entry = RocketJob::DirmonEntry.new(
+              job_class_name: 'Jobs::TestJob',
+              pattern:        '/abc/**',
+              perform_method: :result
+            )
+          assert_equal true, entry.valid?, entry.errors.inspect
+          assert_equal [], entry.errors[:arguments], entry.errors.inspect
+        end
+
         should 'ensure correct number of arguments' do
           assert entry = RocketJob::DirmonEntry.new(
               job_class_name: 'Jobs::TestJob',

data/test/worker_test.rb

@@ -20,6 +20,7 @@ class WorkerTest < Minitest::Test
 
     teardown do
       @job.destroy if @job && !@job.new_record?
+      @worker.destroy if @worker && !@worker.new_record?
     end
 
     context '.config' do
@@ -39,5 +40,58 @@ class WorkerTest < Minitest::Test
       end
     end
 
+    context '#zombie?' do
+      setup do
+        RocketJob::Config.instance.heartbeat_seconds = 1
+      end
+
+      should 'when not a zombie' do
+        @worker.build_heartbeat(
+          updated_at:      2.seconds.ago,
+          current_threads: 3
+        )
+        @worker.started!
+        assert_equal false, @worker.zombie?
+        assert_equal false, @worker.zombie?(4)
+        assert_equal true, @worker.zombie?(1)
+      end
+
+      should 'when a zombie' do
+        @worker.build_heartbeat(
+          updated_at:      1.hour.ago,
+          current_threads: 5
+        )
+        @worker.started!
+        assert_equal true, @worker.zombie?
+      end
+    end
+
+    context '.destroy_zombies' do
+      setup do
+        RocketJob::Config.instance.heartbeat_seconds = 1
+      end
+
+      should 'when not a zombie' do
+        @worker.build_heartbeat(
+          updated_at:      2.seconds.ago,
+          current_threads: 3
+        )
+        @worker.started!
+        assert_equal 0, RocketJob::Worker.destroy_zombies
+        assert_equal true, RocketJob::Worker.where(id: @worker.id).exist?
+      end
+
+      should 'when a zombie' do
+        @worker.build_heartbeat(
+          updated_at:      10.seconds.ago,
+          current_threads: 3
+        )
+        @worker.started!
+        assert_equal 1, RocketJob::Worker.destroy_zombies
+        assert_equal false, RocketJob::Worker.where(id: @worker.id).exist?
+      end
+
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm