job_boss 0.7.9 → 0.7.10

data/bin/job_boss

@@ -32,12 +32,10 @@ Daemons.run_proc('job_boss', daemons_options) do
   end
 
   at_exit do
-    puts "Test puts"
-    boss.logger.info "Before boss.stop"
-    boss.stop
-    boss.logger.info "After boss.stop"
-    boss = JobBoss::Boss.new
-    boss.logger.info "test log!!!!!!!"
+    if BOSS_PID == Process.pid
+      boss.stop
+      boss = JobBoss::Boss.new
+    end
   end
 
   boss.start

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

data/lib/job_boss/job.rb

@@ -10,6 +10,7 @@ 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 :not_cancelled, where('cancelled_at IS NULL')
     scope :mia, where("completed_at IS NOT NULL AND status = 'mia'")
 
     def prototype
@@ -182,7 +183,7 @@ module JobBoss
 
         ids = jobs.collect(&:id)
         Job.uncached do
-          until Job.completed.find_all_by_id(ids).count == jobs.size
+          until Job.completed.not_cancelled.find_all_by_id(ids).count == jobs.size
             sleep(sleep_interval)
 
             if block_given?
@@ -239,7 +240,7 @@ private
     end
 
     def mark_as_cancelled
-      update_attributes(:cancelled_at => Time.now, :completed_at => Time.now, :status => 'cancelled')
+      update_attributes(:cancelled_at => Time.now)
     end
 
     def mark_employee

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: job_boss
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 7
-  - 9
-  version: 0.7.9
+  - 10
+  version: 0.7.10
 platform: ruby
 authors: 
 - Brian Underwood
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-24 00:00:00 -04:00
+date: 2011-03-29 00:00:00 -04:00
 default_executable: job_boss
 dependencies: 
 - !ruby/object:Gem::Dependency