job_boss 0.5.8 → 0.6.0

data/README.markdown

@@ -84,6 +84,12 @@ job_boss also makes it easy to wait for the jobs to be done and to collect the r
 
     Job.result_hash(jobs) # => {[0]=>false, [1]=>false, [2]=>true, [3]=>true, [4]=>false, ... }
 
+You can even define a block to provide updates on progress (the value which is passed into the block is a float between 0.0 and 100.0):
+
+    Job.wait_for_jobs(jobs) do |progress|
+        puts "We're now at #{progress}%"
+    end
+
 For performance, it is recommended that you keep your jobs table clean scheduling execution of the `delete_jobs_before` command on the Job model, which will clean all jobs completed before the specified time:
 
     Job.delete_jobs_before(2.days.ago)

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.5.8'
+  s.version     = '0.6.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Brian Underwood"]
   s.email       = ["ml+job_boss@semi-sentient.com"]

data/lib/job_boss/boss.rb

@@ -124,7 +124,10 @@ private
         @running_jobs = Job.running.where('id in (?)', @running_jobs)
 
         cancelled_jobs = @running_jobs.select(&:cancelled?)
-        cancelled_jobs.each {|job| kill_job(job) }
+        cancelled_jobs.each do |job|
+          logger.warn "Cancelling job ##{job.id}"
+          kill_job(job)
+        end
         @running_jobs -= cancelled_jobs
 
         # Clean out any jobs whos processes have stopped running for some reason
@@ -132,6 +135,8 @@ private
           begin
             Process.kill(0, job.employee_pid.to_i)
           rescue Errno::ESRCH
+            logger.warn "Job ##{job.id} MIA!"
+            job.mark_as_mia
             nil
           end
         end
@@ -174,6 +179,7 @@ private
       begin
         Process.kill("TERM", job.employee_pid.to_i)
       rescue Errno::ESRCH
+        logger.error "Could not kill job ##{job.id}!"
         nil
       end
     end

data/lib/job_boss/job.rb

@@ -10,15 +10,20 @@ module JobBoss
     scope :pending, where('started_at IS NULL AND cancelled_at IS NULL')
     scope :running, where('started_at IS NOT NULL AND completed_at IS NULL')
     scope :completed, where('completed_at IS NOT NULL')
+    scope :mia, where("completed_at IS NOT NULL AND status = 'mia'")
+
+    def prototype
+      self.path + "(#{self.args.join(', ')})"
+    end
 
     # Method used by the boss to dispatch an employee
     def dispatch(boss)
       mark_as_started
-      boss.logger.info "Dispatching Job ##{self.id}"
+      boss.logger.info "Dispatching Job ##{self.id}: #{self.prototype}"
 
       pid = fork do
         ActiveRecord::Base.connection.reconnect!
-        $0 = "[job_boss employee] job ##{self.id} #{self.path}(#{self.args.join(', ')})"
+        $0 = "[job_boss employee] job ##{self.id} #{self.prototype})"
         Process.setpriority(Process::PRIO_PROCESS, 0, 19)
 
         begin
@@ -35,7 +40,7 @@ module JobBoss
             sleep(1)
           end
 
-          Boss.logger.info "Job ##{self.id} completed, exiting..."
+          boss.logger.info "Job ##{self.id} completed in #{self.time_taken} seconds, exiting..."
           Kernel.exit
         end
       end
@@ -94,6 +99,16 @@ module JobBoss
       completed_at && (status == 'success')
     end
 
+    def mark_as_mia
+      self.completed_at = Time.now
+      self.status = 'mia'
+      self.save
+    end
+
+    def mia?
+      completed_at && (status == 'mia')
+    end
+
     # Has the job been assigned to an employee?
     def assigned?
       # If the #assigned? method is being called for but the job hasn't been completed, reload
@@ -137,6 +152,10 @@ module JobBoss
         Job.uncached do
           until Job.completed.find_all_by_id(ids).count == jobs.size
             sleep(sleep_interval)
+
+            if block_given?
+              yield ((Job.where('id in (?)', ids).completed.count.to_f / jobs.size.to_f) * 100.0)
+            end
           end
         end
 

data/test/unit/job_test.rb

@@ -76,6 +76,43 @@ class DaemonTest < ActiveSupport::TestCase
     assert job.cancelled?
     assert_not_nil job.cancelled_at
 
+
+    # Test recording of MIA jobs
+    job = Boss.queue.sleep.sleep_for(20)
+
+    wait_until_job_assigned(job)
+
+    assert_pid_running(job.employee_pid)
+
+    Process.kill(9, job.employee_pid)
+
+    sleep(1)
+
+    assert_pid_not_running(job.employee_pid)
+
+    job.reload
+    assert job.mia?
+    assert_equal [job.id], Job.mia.collect(&:id)
+
+    jobs = (0..10).collect do |i|
+      job = Boss.queue.sleep.sleep_for(1)
+    end
+
+    progresses = []
+    Job.wait_for_jobs(jobs) do |progress|
+#      puts progress
+      progresses << progress
+    end
+
+    assert_equal progresses, progresses.sort
+    assert progresses.all? {|progress| 0.0 <= progress && progress <= 100.0 }
+    assert progresses.any? {|progress| progress > 1.0 }
+
+    # Test deleting of old jobs
+
+    # Sleep for 1 second so that the upcoming deletions work correctly
+    sleep(1)
+
     Job.delete_jobs_before(20.seconds.ago)
     assert Job.completed.count > 0
     Job.delete_jobs_before(1.second.ago)

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 8
-  version: 0.5.8
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Brian Underwood
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 -05:00
+date: 2010-12-22 00:00:00 -05:00
 default_executable: job_boss
 dependencies: 
 - !ruby/object:Gem::Dependency