delayed_job_extras 0.2.2 → 0.3.0

data/generators/dj_extras_generator.rb

@@ -1,9 +1,27 @@
+require 'rails_generator'
 class DjExtrasGenerator < Rails::Generator::Base
   
   def manifest
+    # record do |m|
+    #   m.migration_template "migration.rb", 'db/migrate',
+    #                        :migration_file_name => "add_delayed_job_extras"
+    # end
     record do |m|
-      m.migration_template "migration.rb", 'db/migrate',
-                           :migration_file_name => "add_delayed_job_extras"
+      timestamp = Time.now.utc.strftime("%Y%m%d%H%M%S")
+      db_migrate_path = File.join('db', 'migrate')
+    
+      m.directory(db_migrate_path)
+    
+      Dir.glob(File.join(File.dirname(__FILE__), 'templates', 'migrations', '*.rb')).sort.each_with_index do |f, i|
+        f = File.basename(f)
+        f.match(/\d+\_(.+)/)
+        timestamp = timestamp.succ
+        if Dir.glob(File.join(db_migrate_path, "*_#{$1}")).empty?
+          m.file(File.join('migrations', f), 
+                 File.join(db_migrate_path, "#{timestamp}_#{$1}"), 
+                 {:collision => :skip})
+        end
+      end
     end
   end
   

data/generators/templates/migrations/002_add_more_time_columns_to_dj.rb

@@ -0,0 +1,11 @@
+class AddMoreTimeColumnsToDj < ActiveRecord::Migration
+  def self.up
+    add_column :delayed_jobs, :started_at, :datetime
+    add_column :delayed_jobs, :finished_at, :datetime
+  end
+
+  def self.down
+    remove_column :delayed_jobs, :finished_at
+    remove_column :delayed_jobs, :started_at
+  end
+end

data/lib/delayed_job_extras/job.rb

@@ -20,6 +20,18 @@ module Delayed
     
     alias_method_chain :invoke_job, :dj
     
+    def pending?
+      self.started_at.nil? && self.finished_at.nil?
+    end
+    
+    def running?
+      !self.started_at.nil? && self.finished_at.nil?
+    end
+    
+    def finished?
+      !self.started_at.nil? && !self.finished_at.nil?
+    end
+    
     class << self
       
       def stats(start_date = 1.day.ago.beginning_of_day, end_date = Time.now.beginning_of_day)

data/lib/delayed_job_extras/performable_method.rb

@@ -16,14 +16,20 @@ module Delayed
       
       def perform_with_hoptoad
         dj_id = 'unknown'
-        dj_id = self.dj_object.id if self.dj_object
+        if self.dj_object
+          dj_id = self.dj_object.id
+          self.dj_object.touch(:started_at)
+        end
         begin
-          Delayed::Worker.logger.info("Starting #{self.class.name}#perform (DJ.id = '#{dj_id}')")
-          perform_without_hoptoad
-          Delayed::Worker.logger.info("Completed #{self.class.name}#perform (DJ.id = '#{dj_id}') [SUCCESS]")
+          DJ::Worker.logger.info("Starting #{self.class.name}#perform (DJ.id = '#{dj_id}')")
+          val = perform_without_hoptoad
+          DJ::Worker.logger.info("Completed #{self.class.name}#perform (DJ.id = '#{dj_id}') [SUCCESS]")
+          self.dj_object.touch(:finished_at) if self.dj_object
+          return val
         rescue Exception => e
           notify_hoptoad(e)
-          Delayed::Worker.logger.info("Halted #{self.class.name}#perform (DJ.id = '#{dj_id}') [FAILURE]")
+          DJ::Worker.logger.error("Halted #{self.class.name}#perform (DJ.id = '#{dj_id}') [FAILURE]")
+          self.dj_object.update_attributes(:started_at => nil) if self.dj_object
           raise e
         end
       end

data/lib/delayed_job_extras/worker.rb

@@ -1,4 +1,4 @@
-module Delayed
+module DJ
   class Worker
     
     PRIORITY_LEVELS = {:immediate => 10000, :high => 1000, :medium => 500, :normal => 0, :low => -100, :who_cares => -1000}
@@ -35,7 +35,7 @@ module Delayed
     end
     
     def logger
-      @logger || Delayed::Worker.logger
+      @logger || DJ::Worker.logger
     end
     
     def enqueue(priority = self.priority, run_at = self.run_at)
@@ -57,7 +57,7 @@ module Delayed
       def priority(level = 0)
         define_method('priority') do
           if level.is_a?(Symbol)
-            level = Delayed::Worker::PRIORITY_LEVELS[level] ||= 0
+            level = DJ::Worker::PRIORITY_LEVELS[level] ||= 0
           end
           return @priority ||= level
         end
@@ -76,16 +76,22 @@ module Delayed
       def perform(&block)
         define_method(:perform) do
           dj_id = 'unknown'
-          dj_id = self.dj_object.id if self.dj_object
+          if self.dj_object
+            dj_id = self.dj_object.id
+            self.dj_object.touch(:started_at)
+          end
           begin
             self.logger.info("Starting #{self.class.name}#perform (DJ.id = '#{dj_id}')")
             val = self.instance_eval(&block)
             self.logger.info("Completed #{self.class.name}#perform (DJ.id = '#{dj_id}') [SUCCESS]")
+            self.dj_object.touch(:finished_at) if self.dj_object
             return val
           rescue Exception => e
+            puts e
             # send to hoptoad!
             notify_hoptoad(e)
-            self.logger.info("Halted #{self.class.name}#perform (DJ.id = '#{dj_id}') [FAILURE]")
+            self.logger.error("Halted #{self.class.name}#perform (DJ.id = '#{dj_id}') [FAILURE]")
+            self.dj_object.update_attributes(:started_at => nil) if self.dj_object
             raise e
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: delayed_job_extras
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-24 00:00:00 -04:00
+date: 2009-09-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,8 @@ files:
 - README
 - LICENSE
 - generators/dj_extras_generator.rb
-- generators/templates/migration.rb
+- generators/templates/migrations/001_add_delayed_job_extras.rb
+- generators/templates/migrations/002_add_more_time_columns_to_dj.rb
 has_rdoc: true
 homepage: ""
 licenses: []