rocketjob 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8f3f4b74a0c8fc21434e841b045e285474d2508
-  data.tar.gz: 9b1a0c551b00e0470f7f0cf524d0b24c493df900
+  metadata.gz: 2c812dcc683d598eef994060ede4cfcdeacd0cb0
+  data.tar.gz: e47aba9440145857bdce60e42801696971201632
 SHA512:
-  metadata.gz: 36c29026484cb8f60930318609c94c31044231bb43c53cac55185f89b6479e5446a53522e49bac5bad86506988338fdca48b8f67b2094209b93a144c355d1ff8
-  data.tar.gz: 333637778b2cd085e5ea58b1852e57626859e8499918cfd48af4e2dfac893792c5f9619b42070ec0303209ef9287f9e50d281060a92f4e07bcd2461b434e3c6c
+  metadata.gz: ff08de7a9e29d252e8329966fe508ead35e0c883bac0ab77eab50a94e0404fbd5e4d790619afe626b9611e6edf767e70d08b67853cf10dd68c7d00267688d02b
+  data.tar.gz: 6c95b4d77dba6fb156e2f41714b815ddc8faa503b75bea41df82fbc47197654be9686092a65bfd32a876937fd231ed3cfb82b80e224b97d0ac505c99e55ec361

data/lib/rocket_job/active_worker.rb

@@ -27,7 +27,7 @@ module RocketJob
     # Requeues all jobs for which the workers have disappeared
     def self.requeue_zombies
       all.each do |active_worker|
-        next if !active_worker.zombie? || !active_worker.job.may_requeue?
+        next if !active_worker.zombie? || !active_worker.job.may_requeue?(active_worker.server_name)
         active_worker.job.requeue!(active_worker.server_name)
       end
     end

data/lib/rocket_job/config.rb

@@ -1,5 +1,4 @@
 require 'yaml'
-# encoding: UTF-8
 module RocketJob
   # Centralized Configuration for Rocket Jobs
   class Config

data/lib/rocket_job/heartbeat.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module RocketJob
   # Heartbeat
   #

data/lib/rocket_job/job.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module RocketJob
   # The base job from which all jobs are created
   class Job

data/lib/rocket_job/job_exception.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module RocketJob
   class JobException
     include Plugins::Document

data/lib/rocket_job/plugins/cron.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'active_support/concern'
 
 module RocketJob

data/lib/rocket_job/plugins/document.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'active_support/concern'
 
 module RocketJob

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

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'active_support/concern'
 
 module RocketJob

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

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'active_support/concern'
 
 module RocketJob

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

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'active_support/concern'
 
 module RocketJob

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

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'active_support/concern'
 
 module RocketJob

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

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'active_support/concern'
 
 module RocketJob

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

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'active_support/concern'
 
 module RocketJob

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

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'active_support/concern'
 
 # Worker behavior for a job

data/lib/rocket_job/plugins/processing_window.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'active_support/concern'
 
 module RocketJob

data/lib/rocket_job/plugins/restart.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'active_support/concern'
 
 module RocketJob
@@ -46,19 +45,34 @@ module RocketJob
 
         # Copy across run_at for future dated jobs
         attrs['run_at'] = run_at if run_at && (run_at > Time.now)
-        # Allow Singleton to prevent the creation of a new job if one is already running
-        job             = self.class.create(attrs)
-        if job.persisted?
-          logger.info("Started a new job instance: #{job.id}")
-        else
-          logger.info('New job instance not started since one is already active')
-        end
+
+        rocket_job_restart_create(attrs)
       end
 
       def rocket_job_restart_abort
         new_record? ? abort : abort!
       end
 
+      # Allow Singleton to prevent the creation of a new job if one is already running
+      # Retry since the delete may not have persisted to disk yet.
+      def rocket_job_restart_create(attrs, retry_limit = 3, sleep_interval = 0.1)
+        count = 0
+        while count < retry_limit
+          job = self.class.create(attrs)
+          if job.persisted?
+            logger.info("Started a new job instance: #{job.id}")
+            return true
+          else
+            logger.info('Job already active, retrying after a short sleep')
+            sleep(sleep_interval)
+          end
+          count += 1
+        end
+        logger.warn('New job instance not started since one is already active')
+        false
+      end
+
+
     end
   end
 end

data/lib/rocket_job/plugins/retry.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'active_support/concern'
 
 module RocketJob

data/lib/rocket_job/plugins/singleton.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'active_support/concern'
 
 module RocketJob

data/lib/rocket_job/plugins/state_machine.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'thread'
 require 'active_support/concern'
 require 'aasm'

data/lib/rocket_job/server.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'concurrent'
 module RocketJob
   # Server

data/lib/rocket_job/version.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module RocketJob #:nodoc
-  VERSION = '3.0.1'
+  VERSION = '3.0.2'
 end

data/lib/rocket_job/worker.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'concurrent'
 require 'forwardable'
 module RocketJob

data/lib/rocketjob.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'semantic_logger'
 require 'mongoid'
 require 'rocket_job/extensions/mongo/logging'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
-- !ruby/object:Gem::Dependency
-  name: mongo_ha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 description: 
 email:
 - support@rocketjob.io