cascade 0.0.2 → 0.0.3

data/lib/cascade/job/callbacks.rb

@@ -2,14 +2,11 @@ module Cascade
   module Job
     module Callbacks
       def run_callbacks(action, job_spec)
-        if self.class.instance_variable_defined?('@callbacks')
-          callbacks = self.class.instance_variable_get('@callbacks')
-          callbacks[action].each do |callback|
-            if callback.is_a?(Symbol)
-              send(callback, job_spec)
-            else
-              instance_exec job_spec, &callback
-            end
+        self.class.callbacks[action].each do |callback|
+          if callback.is_a?(Symbol)
+            send(callback, job_spec)
+          else
+            instance_exec job_spec, &callback
           end
         end
       end
@@ -21,8 +18,15 @@ module Cascade
           end
         end
 
+        def callbacks
+          @callbacks ||= if superclass.respond_to?(:callbacks)
+            superclass.send(:callbacks)
+          else
+            Hash.new { |h,k| h[k] = [] }
+          end
+        end
+
         def add_callback(action, method = nil, &block)
-          callbacks = @callbacks ||= Hash.new { |h,k| h[k] = [] }
           callbacks[action] << (method || block)
         end
       end

data/lib/cascade/worker.rb

@@ -5,42 +5,78 @@ module Cascade
       trap('INT') { $exit = true }
 
       loop do
+        result = run
+
+        break if $exit
+
+        count = result.sum
+        if count.zero?
+          sleep(5)
+        end
+
         break if $exit
-        run
       end
     end
 
     def self.run
+      success = 0
+      failure = 0
+
       find_available.each do |job_spec|
         break if $exit
         if lock_exclusively!(job_spec)
-          run_forked(job_spec)
+          if run_forked(job_spec)
+            success += 1
+          else
+            failure += 1
+          end
         end
       end
+
+      [success, failure]
     end
 
     def self.run_forked(job_spec)
+      read, write = IO.pipe
+
       pid = fork do
         job = job_spec.job
         $0 = "Cascade::Job : #{name} : #{job.describe}"
-        run_job(job_spec, job)
+        if run_job(job_spec, job)
+          write.puts '1'
+        else
+          write.puts '0'
+        end
       end
+      write.close
+      result = read.read.strip
       Process.wait(pid)
+
+      return result == '1'
     end
 
     def self.run_job(job_spec, job)
+      job_spec.re_run = false
       completed_successully = true
       begin
         job.run_callbacks(:before_run, job_spec)
+
         job.run
+
         job.run_callbacks(:on_success, job_spec)
+
       rescue Exception => ex
         job_spec.last_error = [ex, ex.backtrace].flatten.join("\n")
         job_spec.failed_at = Time.now.utc
+
         job.run_callbacks(:on_error, job_spec)
+
         completed_successully = false
       ensure
         job.run_callbacks(:after_run, job_spec)
+
+        job_spec.locked_by = nil
+        job_spec.locked_at = nil
       end
       if completed_successully && !job_spec.re_run?
         job_spec.destroy
@@ -76,7 +112,7 @@ module Cascade
     end
 
     private
-      def self.find_available
+      def self.find_available(num = 10)
         right_now = Time.now.utc
 
         conditions = {
@@ -85,7 +121,7 @@ module Cascade
           :locked_at => nil
         }
 
-        job_specs = JobSpec.where(conditions).limit(-1).sort([[:priority, 1], [:run_at, 1]]).all
+        job_specs = JobSpec.where(conditions).limit(-num).sort([[:priority, 1], [:run_at, 1]]).all
         job_specs
       end
 

metadata

@@ -2,7 +2,7 @@
 name: cascade
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Andrew Timberlake