job_boss 0.7.18 → 0.7.19

data/job_boss.gemspec

@@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "job_boss"
-  s.version     = '0.7.18'
+  s.version     = '0.7.19'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Brian Underwood"]
   s.email       = ["ml+job_boss@semi-sentient.com"]

data/lib/job_boss/boss.rb

@@ -92,8 +92,6 @@ module JobBoss
 
         if jobs.empty?
           jobs = wait_for_jobs
-          jobs = Job.pending.find(jobs)
-          Job.update_all(['started_at = ?', Time.now], ['id in (?)', jobs])
         end
 
         [available_employee_count, jobs.size].min.times do

data/lib/job_boss/job.rb

@@ -20,30 +20,31 @@ module JobBoss
 
     # Method used by the boss to dispatch an employee
     def dispatch(boss)
-      mark_as_started
-      boss.logger.info "Dispatching Job ##{self.id}: #{self.prototype}"
-
-      pid = fork do
-        ActiveRecord::Base.connection.reconnect!
-        $0 = "[job_boss employee] job ##{self.id} #{self.prototype})"
-        Process.setpriority(Process::PRIO_PROCESS, 0, 19)
-
-        begin
-          mark_employee
-
-          value = self.class.call_path(self.path, *self.args)
+      if mark_as_started
+        boss.logger.info "Dispatching Job ##{self.id}: #{self.prototype}"
+
+        pid = fork do
+          ActiveRecord::Base.connection.reconnect!
+          $0 = "[job_boss employee] job ##{self.id} #{self.prototype})"
+          Process.setpriority(Process::PRIO_PROCESS, 0, 19)
+
+          begin
+            mark_employee
+
+            value = self.class.call_path(self.path, *self.args)
+
+            self.update_attribute(:result, value)
+          rescue Exception => exception
+            mark_exception(exception)
+            boss.logger.error "Error running job ##{self.id}!"
+          ensure
+            until mark_as_completed
+              sleep(1)
+            end
 
-          self.update_attribute(:result, value)
-        rescue Exception => exception
-          mark_exception(exception)
-          boss.logger.error "Error running job ##{self.id}!"
-        ensure
-          until mark_as_completed
-            sleep(1)
+            boss.logger.info "Job ##{self.id} completed in #{self.time_taken} seconds, exiting..."
+            Kernel.exit
           end
-
-          boss.logger.info "Job ##{self.id} completed in #{self.time_taken} seconds, exiting..."
-          Kernel.exit
         end
       end
       Process.detach(pid)
@@ -238,7 +239,7 @@ module JobBoss
 private
 
     def mark_as_started
-      update_attributes(:started_at => Time.now)
+      Job.update_all(['started_at = ?', Time.now], ['started_at IS NULL AND id = ?', job]) > 0
     end
 
     def mark_as_cancelled

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: job_boss
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: false
   segments: 
   - 0
   - 7
-  - 18
-  version: 0.7.18
+  - 19
+  version: 0.7.19
 platform: ruby
 authors: 
 - Brian Underwood