batchy 0.2.0 → 0.2.1

data/lib/batchy.rb

@@ -76,6 +76,8 @@ module Batchy
     options = args.extract_options!
 
     batch = Batch.create options
+    batch.clear_zombies unless batch.guid.nil?
+
     batch.start!
     return false if batch.ignored?
     begin

data/lib/batchy/batch.rb

@@ -69,6 +69,17 @@ module Batchy
       duplicate_batches.count > 0
     end
 
+    # Removes duplicate batches that are stuck in
+    # a running state
+    def clear_zombies
+      duplicate_batches.each do | dup |
+        if not dup.process_running?
+          dup.error = Batchy::Error.new("Process has died, moving to a finished state")
+          dup.finish!
+        end
+      end
+    end
+
     # Find all batches with the same guid that are
     # running.
     def duplicate_batches
@@ -85,7 +96,7 @@ module Batchy
     # when the error is saved
     def error=(err)
       write_attribute(:error, err)
-      write_attribute(:backtrace, err.backtrace)
+      write_attribute(:backtrace, err.backtrace) if err.respond_to?(:backtrace)
     end
 
     # Conversely, the backtrace is added to the error after a read
@@ -170,6 +181,14 @@ module Batchy
       end
     end
 
+    # Checks to see if the process attached to this
+    # batch is active
+    def process_running?
+      raise Batchy::Error, 'Current host does not match the host running the batch' unless Socket.gethostname == hostname
+
+      not Sys::ProcTable.ps(pid).blank?
+    end
+
     # :nodoc:
     def run_ensure_callbacks
       Batchy.configure.global_ensure_callbacks.each do | ec |

data/lib/batchy/version.rb

@@ -1,3 +1,3 @@
 module Batchy
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: batchy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Bob Briski
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-03 00:00:00 Z
+date: 2012-04-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4457839131585176911
+      hash: 1197839351505114963
       segments: 
       - 0
       version: "0"
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4457839131585176911
+      hash: 1197839351505114963
       segments: 
       - 0
       version: "0"