delayed_job_on_steroids 1.7.5 → 2.0.0

data/.gitignore

@@ -1,2 +1,3 @@
 pkg/
 rdoc/
+coverage/

data/README.markdown

@@ -0,0 +1,124 @@
+h1. Delayed::Job (on steroids)
+
+delayed_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background. 
+Amongst those tasks are:
+
+* sending massive newsletters
+* image resizing
+* http downloads
+* updating smart collections
+* updating solr
+* batch imports 
+* spam checks
+
+
+h2. Setup
+
+The library evolves around a delayed_jobs table which can be created by using:
+
+	script/generate delayed_job_migration
+
+The created table looks as follows: 
+
+	create_table :delayed_jobs, :force => true do |table|
+	  table.integer  :priority,  :null => false, :default => 0  # Allows some jobs to jump to the front of the queue.
+	  table.integer  :attempts,  :null => false, :default => 0  # Provides for retries, but still fail eventually.
+	  table.text     :handler,   :null => false                 # YAML-encoded string of the object that will do work.
+	  table.string   :job_type,  :null => false                 # Class name of the job object, for type-specific workers.
+	  table.string   :job_tag                                   # Helps to locate this job among others of the same type in your application.
+	  table.string   :last_error                                # Reason for last failure.
+	  table.datetime :run_at,    :null => false                 # When to run. Could be Job.db_time_now or some time in the future.
+	  table.datetime :locked_at                                 # Set when a client is working on this object.
+	  table.string   :locked_by                                 # Who is working on this object (if locked).
+	  table.datetime :failed_at                                 # Set when all retries have failed (actually, by default, the record is deleted instead).
+	  table.timestamps
+	end
+
+On failure, the job is scheduled again in 5 seconds + N ** 4, where N is the number of retries.
+
+The default `MAX_ATTEMPTS` is `25`. After this, the job either deleted (default), or left in the database with `failed_at` set.
+With the default of 25 attempts, the last retry will be 20 days later, with the last interval being almost 100 hours.
+
+The default `MAX_RUN_TIME` is `4.hours`. If your job takes longer than that, another computer could pick it up. It's up to you to
+make sure your job doesn't exceed this time. You should set this to the longest time you think the job could take.
+
+By default, it will delete failed jobs (and it always deletes successful jobs). If you want to keep failed jobs, set `Delayed::Worker.destroy_failed_jobs = false`. The failed jobs will be marked with non-null `failed_at`.
+
+Here is an example of changing job parameters in Rails:
+
+	# config/initializers/delayed_job_config.rb
+	Delayed::Worker.destroy_failed_jobs = false
+	silence_warnings do
+	  Delayed::Job.const_set("MAX_ATTEMPTS", 3)
+	  Delayed::Job.const_set("MAX_RUN_TIME", 5.minutes)
+	end
+
+
+h2. Usage
+
+Jobs are simple ruby objects with a method called perform. Any object which responds to perform can be stuffed into the jobs table.
+Job objects are serialized to yaml so that they can later be resurrected by the job runner. 
+
+	class NewsletterJob < Struct.new(:text, :emails)
+	  def perform
+	    emails.each { |e| NewsletterMailer.deliver_text_to_email(text, e) }
+	  end    
+	end  
+
+	Delayed::Job.enqueue(NewsletterJob.new('lorem ipsum...', Customers.find(:all).collect(&:email)))
+
+There is also a second way to get jobs in the queue: send_later. 
+
+	BatchImporter.new(Shop.find(1)).send_later(:import_massive_csv, massive_csv)
+
+This will simply create a `Delayed::PerformableMethod` job in the jobs table which serializes all the parameters you pass to it. There are some special smarts for active record objects which are stored as their text representation and loaded from the database fresh when the job is actually run later.
+                                                                                                                              
+                                                                                                                    
+h3. Running the jobs
+
+Run `script/generate delayed_job` to add `script/delayed_job`. This script can then be used to manage a process which will start working off jobs.
+
+	$ ruby script/delayed_job -h
+
+Workers can be running on any computer, as long as they have access to the database and their clock is in sync. You can even
+run multiple workers on per computer, but you must give each one a unique name (`script/delayed_job` will do it for you).
+Keep in mind that each worker will check the database at least every 5 seconds.
+
+
+h2. About this fork
+
+This fork was born to introduce new features to delayed_job, but also to be almost-fully compatible with it.
+
+
+h3. Incompatibilities with tobi's delayed_job
+
+* Database schema:
+ * `last_error` column's type changed from string to text;
+ * some columns are NOT NULL now.
+* Invert meaning of `priority` field: job with lesser priority will be executed earlier. See http://www.elevatedcode.com/articles/2009/11/04/speeding-up-delayed-job/ for background.
+
+
+h3. Changes
+
+* 2.0:
+ * Added `script/delayed_job` - runs as daemon, several workers concurrently, minimal and maximal priority, job type, logger, etc.
+ * Added rake tasks: `jobs:clear:all`, `jobs:clear:failed`, `jobs:stats`.
+ * Added timeout for job execution.
+ * Added `send_at` method for queueing jobs in the future.
+ * Consume less memory with Ruby Enterprise Edition.
+
+* 1.7.5:
+ * Added possibility to run only specific types of jobs.
+
+
+h3. Original changelog
+
+* 1.7.0: Added `failed_at` column which can optionally be set after a certain amount of failed job attempts. By default failed job attempts are destroyed after about a month. 
+
+* 1.6.0: Renamed `locked_until` to `locked_at`. We now store when we start a given job instead of how long it will be locked by the worker. This allows us to get a reading on how long a job took to execute.                    
+
+* 1.5.0: Job runners can now be run in parallel. Two new database columns are needed: `locked_until` and `locked_by`. This allows us to use   pessimistic locking instead of relying on row level locks. This enables us to run as many worker processes as we need to speed up queue processing.
+
+* 1.2.0: Added `#send_later` to Object for simpler job creation
+
+* 1.0.0: Initial release

data/Rakefile

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'rubygems'
 require 'rake'
 
@@ -19,15 +21,12 @@ rescue LoadError
 end
 
 require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
+Spec::Rake::SpecTask.new(:spec)
 
 Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
+  spec.rcov_opts = ['--exclude', 'gems']
+  spec.verbose = true
 end
 
 task :spec => :check_dependencies

data/VERSION

@@ -1 +1 @@
-1.7.5
+2.0.0

data/delayed_job_on_steroids.gemspec

@@ -5,37 +5,42 @@
 
 Gem::Specification.new do |s|
   s.name = %q{delayed_job_on_steroids}
-  s.version = "1.7.5"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias L\303\274tke", "Aleksey Palazhchenko"]
-  s.date = %q{2010-03-15}
+  s.date = %q{2010-03-24}
   s.description = %q{Delated_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background.}
   s.email = %q{aleksey.palazhchenko@gmail.com}
   s.extra_rdoc_files = [
-    "README.textile"
+    "README.markdown"
   ]
   s.files = [
     ".gitignore",
      "MIT-LICENSE",
-     "README.textile",
+     "README.markdown",
      "Rakefile",
      "VERSION",
      "delayed_job_on_steroids.gemspec",
+     "generators/delayed_job/delayed_job_generator.rb",
+     "generators/delayed_job/templates/script",
      "generators/delayed_job_migration/delayed_job_migration_generator.rb",
      "generators/delayed_job_migration/templates/migration.rb",
      "init.rb",
-     "lib/delayed/job.rb",
-     "lib/delayed/message_sending.rb",
-     "lib/delayed/performable_method.rb",
-     "lib/delayed/worker.rb",
-     "lib/delayed_job.rb",
+     "lib/delayed_job_on_steroids.rb",
+     "lib/delayed_on_steroids/command.rb",
+     "lib/delayed_on_steroids/job.rb",
+     "lib/delayed_on_steroids/job_deprecations.rb",
+     "lib/delayed_on_steroids/message_sending.rb",
+     "lib/delayed_on_steroids/performable_method.rb",
+     "lib/delayed_on_steroids/tasks.rb",
+     "lib/delayed_on_steroids/worker.rb",
      "spec/database.rb",
      "spec/delayed_method_spec.rb",
      "spec/job_spec.rb",
      "spec/story_spec.rb",
-     "tasks/jobs.rake",
-     "tasks/tasks.rb"
+     "spec/worker_spec.rb",
+     "tasks/jobs.rake"
   ]
   s.homepage = %q{http://github.com/AlekSi/delayed_job_on_steroids}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -46,7 +51,8 @@ Gem::Specification.new do |s|
     "spec/delayed_method_spec.rb",
      "spec/job_spec.rb",
      "spec/story_spec.rb",
-     "spec/database.rb"
+     "spec/database.rb",
+     "spec/worker_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/generators/delayed_job/delayed_job_generator.rb

@@ -0,0 +1,9 @@
+class DelayedJobGenerator < Rails::Generator::Base
+
+  def manifest
+    record do |m|
+      m.template 'script', 'script/delayed_job', :chmod => 0755
+    end
+  end
+
+end

data/generators/delayed_job/templates/script

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment'))
+require 'delayed_on_steroids/command'
+Delayed::Command.new.run

data/generators/delayed_job_migration/templates/migration.rb

@@ -1,22 +1,26 @@
 class CreateDelayedJobs < ActiveRecord::Migration
   def self.up
-    create_table :delayed_jobs, :force => true do |t|
-      t.integer  :priority, :default => 0      # Allows some jobs to jump to the front of the queue
-      t.integer  :attempts, :default => 0      # Provides for retries, but still fail eventually.
-      t.text     :handler                      # YAML-encoded string of the object that will do work
-      t.string   :job_type                     # Class name of the job object, for type-specific workers
-      t.string   :last_error                   # reason for last failure (See Note below)
-      t.datetime :run_at                       # When to run. Could be Time.now for immediately, or sometime in the future.
-      t.datetime :locked_at                    # Set when a client is working on this object
-      t.datetime :failed_at                    # Set when all retries have failed (actually, by default, the record is deleted instead)
-      t.string   :locked_by                    # Who is working on this object (if locked)
-
-      t.timestamps
+    create_table :delayed_jobs, :force => true do |table|
+      table.integer  :priority,  :null => false, :default => 0  # Allows some jobs to jump to the front of the queue.
+      table.integer  :attempts,  :null => false, :default => 0  # Provides for retries, but still fail eventually.
+      table.text     :handler,   :null => false                 # YAML-encoded string of the object that will do work.
+      table.string   :job_type,  :null => false                 # Class name of the job object, for type-specific workers.
+      table.string   :job_tag                                   # Helps to locate this job among others of the same type in your application.
+      table.string   :last_error                                # Reason for last failure.
+      table.datetime :run_at,    :null => false                 # When to run. Could be Job.db_time_now for immediately, or sometime in the future.
+      table.datetime :locked_at                                 # Set when a client is working on this object.
+      table.string   :locked_by                                 # Who is working on this object (if locked).
+      table.datetime :failed_at                                 # Set when all retries have failed (actually, by default, the record is deleted instead).
+      table.timestamps
     end
 
-    add_index :delayed_jobs, :locked_by
+    add_index :delayed_jobs, [:priority, :run_at]
     add_index :delayed_jobs, :job_type
-    add_index :delayed_jobs, :priority
+    add_index :delayed_jobs, :job_tag
+    add_index :delayed_jobs, :run_at
+    add_index :delayed_jobs, :locked_at
+    add_index :delayed_jobs, :locked_by
+    add_index :delayed_jobs, :failed_at
   end
 
   def self.down

data/init.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/lib/delayed_job'
+require File.dirname(__FILE__) + '/lib/delayed_job_on_steroids'

data/lib/delayed_job_on_steroids.rb

@@ -0,0 +1,10 @@
+autoload :ActiveRecord, 'active_record'
+
+require File.dirname(__FILE__) + '/delayed_on_steroids/message_sending'
+require File.dirname(__FILE__) + '/delayed_on_steroids/performable_method'
+require File.dirname(__FILE__) + '/delayed_on_steroids/job_deprecations'
+require File.dirname(__FILE__) + '/delayed_on_steroids/job'
+require File.dirname(__FILE__) + '/delayed_on_steroids/worker'
+
+Object.send(:include, Delayed::MessageSending)   
+Module.send(:include, Delayed::MessageSending::ClassMethods)

data/lib/delayed_on_steroids/command.rb

@@ -0,0 +1,104 @@
+require 'optparse'
+
+module Delayed
+
+  # Used by script/delayed_job: parses options, sets logger, invokes Worker.
+  class Command
+
+    def initialize
+      @worker_count = 1
+      @run_as_daemon = false
+
+      ARGV.clone.options do |opts|
+        opts.separator "Options:"
+        opts.on('--worker-name=name', String, 'Worker name. Default is auto-generated.') { |n| Delayed::Worker.name = n }
+        opts.on('--min-priority=number', Integer, 'Minimum priority of jobs to run.')    { |n| Delayed::Worker.min_priority = n }
+        opts.on('--max-priority=number', Integer, 'Maximum priority of jobs to run.')    { |n| Delayed::Worker.max_priority = n }
+        opts.on('--job-types=types', String, 'Type of jobs to run.')                     { |t| Delayed::Worker.job_types = t.split(',') }
+        opts.on('--keep-failed-jobs', 'Do not remove failed jobs from database.')        { Delayed::Worker.destroy_failed_jobs = false }
+        opts.on('--log-file=file', String, 'Use specified file to log instead of Rails default logger.') do |f|
+          Delayed::Worker.logger = ActiveSupport::BufferedLogger.new(f)
+        end
+        opts.on("-q", "--quiet", "Be quieter.")                                          { @quiet = true }
+        opts.on("-d", "--daemon", "Make worker run as a Daemon.")                        { @run_as_daemon = true }
+        opts.on('-n', '--number-of-workers=number', Integer, "Number of unique workers to spawn. Implies -d option if number > 1.") do |n|
+          @worker_count = ([n, 1].max rescue 1)
+          @run_as_daemon ||= (@worker_count > 1)
+        end
+        opts.on("-e", "--environment=name", String,
+          "Specifies the environment to run this worker under (test/development/production/etc).") do |e|
+          ENV["RAILS_ENV"] = e
+          RAILS_ENV.replace(e)
+        end
+
+        opts.on("-h", "--help", "Show this help message.") { puts opts; exit }
+        opts.parse!
+      end
+    end
+
+    def spawn_workers
+      # fork children if needed
+      worker_no = nil
+      if @worker_count > 1
+        it_is_parent = true
+        @worker_count.times do |no|
+          it_is_parent = fork
+          worker_no = no
+          break unless it_is_parent
+        end
+        exit 0 if it_is_parent
+      end
+
+      Process.daemon if @run_as_daemon
+
+      if Delayed::Worker.name.nil?
+        Delayed::Worker.name = ("host:#{Socket.gethostname} " rescue "") + "pid:#{Process.pid}"
+      else
+        Delayed::Worker.name += worker_no.to_s
+      end
+    end
+
+    def write_pid
+      pid = "#{RAILS_ROOT}/tmp/pids/dj_#{Delayed::Worker.name.parameterize('_')}.pid"
+      File.open(pid, 'w') { |f| f.write(Process.pid) }
+      at_exit { File.delete(pid) if File.exist?(pid) }
+    end
+
+    def setup_logger
+      if Delayed::Worker.logger.respond_to?(:auto_flushing=)
+        Delayed::Worker.logger.auto_flushing = true
+      end
+
+      if @quiet and Delayed::Worker.logger.respond_to?(:level=)
+        if Delayed::Worker.logger.kind_of?(Logger)
+          Delayed::Worker.logger.level = Logger::Severity::INFO
+        elsif Delayed::Worker.logger.kind_of?(ActiveSupport::BufferedLogger)
+          Delayed::Worker.logger.level = ActiveSupport::BufferedLogger::Severity::INFO
+       end
+      end
+
+      ActiveRecord::Base.logger = Delayed::Worker.logger
+    end
+
+    def run
+      warn "Running in #{RAILS_ENV} environment!" if RAILS_ENV.include?("dev") or RAILS_ENV.include?("test")
+
+      # Saves memory with Ruby Enterprise Edition
+      if GC.respond_to?(:copy_on_write_friendly=)
+        GC.copy_on_write_friendly = true
+      end
+
+      spawn_workers
+      Dir.chdir(RAILS_ROOT)
+      write_pid
+      setup_logger
+      ActiveRecord::Base.connection.reconnect!
+
+      Delayed::Worker.instance.start
+    rescue => e
+      Delayed::Worker.logger.fatal(e)
+      STDERR.puts(e.message)
+      exit 1
+    end
+  end
+end

data/lib/{delayed → delayed_on_steroids}/job.rb

@@ -1,51 +1,45 @@
+require 'timeout'
+
 module Delayed
 
   class DeserializationError < StandardError
   end
 
   # A job object that is persisted to the database.
-  # Contains the work object as a YAML field.
+  # Contains the work object as a YAML field +handler+.
   class Job < ActiveRecord::Base
-    MAX_ATTEMPTS = 25
-    MAX_RUN_TIME = 4.hours
     set_table_name :delayed_jobs
+    before_save { |job| job.run_at ||= job.class.db_time_now }
 
-    # By default failed jobs are destroyed after too many attempts.
-    # If you want to keep them around (perhaps to inspect the reason
-    # for the failure), set this to false.
-    cattr_accessor :destroy_failed_jobs
-    self.destroy_failed_jobs = true
-
-    # Every worker has a unique name which by default is the pid of the process.
-    # There are some advantages to overriding this with something which survives worker retarts:
-    # Workers can safely resume working on tasks which are locked by themselves. The worker will assume that it crashed before.
-    cattr_accessor :worker_name
-    self.worker_name = "host:#{Socket.gethostname} pid:#{Process.pid}" rescue "pid:#{Process.pid}"
+    extend JobDeprecations
 
-    NextTaskSQL         = '(run_at <= ? AND (locked_at IS NULL OR locked_at < ?) OR (locked_by = ?)) AND failed_at IS NULL'
-    NextTaskOrder       = 'priority DESC, run_at ASC'
+    MAX_ATTEMPTS = 25
+    MAX_RUN_TIME = 4.hours
 
     ParseObjectFromYaml = /\!ruby\/\w+\:([^\s]+)/
 
-    cattr_accessor :min_priority, :max_priority, :job_types
-    self.min_priority = nil
-    self.max_priority = nil
-    self.job_types    = nil
-
-    # When a worker is exiting, make sure we don't have any locked jobs.
-    def self.clear_locks!
-      update_all("locked_by = null, locked_at = null", ["locked_by = ?", worker_name])
-    end
-
+    # Returns +true+ if current job failed.
     def failed?
-      failed_at
+      not failed_at.nil?
     end
     alias_method :failed, :failed?
 
+    # Returns +true+ if current job locked.
+    def locked?
+      not locked_at.nil?
+    end
+    alias_method :locked, :locked?
+
     def payload_object
       @payload_object ||= deserialize(self['handler'])
     end
 
+    def payload_object=(object)
+      self['job_type'] = object.class.to_s
+      self['handler']  = object.to_yaml
+    end
+
+    # Returns job name.
     def name
       @name ||= begin
         payload = payload_object
@@ -57,62 +51,55 @@ module Delayed
       end
     end
 
-    def payload_object=(object)
-      self['job_type'] = object.class.to_s
-      self['handler']  = object.to_yaml
-    end
-
-    # Reschedule the job in the future (when a job fails).
-    # Uses an exponential scale depending on the number of failed attempts.
+    # Reschedule the job to run at +time+ (when a job fails).
+    # If +time+ is nil it uses an exponential scale depending on the number of failed attempts.
     def reschedule(message, backtrace = [], time = nil)
-      if self.attempts < MAX_ATTEMPTS
+      if (self.attempts += 1) < MAX_ATTEMPTS
         time ||= Job.db_time_now + (attempts ** 4) + 5
 
-        self.attempts    += 1
         self.run_at       = time
         self.last_error   = message + "\n" + backtrace.join("\n")
-        self.unlock
+        self.locked_at    = nil
+        self.locked_by    = nil
         save!
       else
-        logger.info "* [JOB] PERMANENTLY removing #{self.name} because of #{attempts} consequetive failures."
-        destroy_failed_jobs ? destroy : update_attribute(:failed_at, Delayed::Job.db_time_now)
+        Worker.logger.warn("* [#{Worker.name}] PERMANENTLY removing #{self.name} because of #{attempts} consequetive failures.")
+        Worker.destroy_failed_jobs ? destroy : update_attribute(:failed_at, self.class.db_time_now)
       end
     end
 
-
     # Try to run one job. Returns true/false (work done/work failed) or nil if job can't be locked.
-    def run_with_lock(max_run_time, worker_name)
-      logger.info "* [JOB] aquiring lock on #{name}"
+    def run_with_lock(max_run_time = MAX_RUN_TIME, worker_name = Worker.name)
+      Worker.logger.info("* [#{Worker.name}] acquiring lock on #{name}")
       unless lock_exclusively!(max_run_time, worker_name)
         # We did not get the lock, some other worker process must have
-        logger.warn "* [JOB] failed to aquire exclusive lock for #{name}"
+        Worker.logger.warn("* [#{Worker.name}] failed to acquire exclusive lock for #{name}")
         return nil # no work done
       end
 
       begin
         runtime =  Benchmark.realtime do
-          invoke_job # TODO: raise error if takes longer than max_run_time
+          Timeout.timeout(max_run_time.to_i) { invoke_job }
           destroy
         end
-        # TODO: warn if runtime > max_run_time ?
-        logger.info "* [JOB] #{name} completed after %.4f" % runtime
+        Worker.logger.info("* [#{Worker.name}] #{name} completed after %.4f" % runtime)
         return true  # did work
       rescue Exception => e
-        reschedule e.message, e.backtrace
+        reschedule(e.message, e.backtrace)
         log_exception(e)
         return false  # work failed
       end
     end
 
-    # Add a job to the queue
+    # Add a job to the queue. Arguments: priority, run_at.
     def self.enqueue(*args, &block)
       object = block_given? ? EvaledJob.new(&block) : args.shift
 
       unless object.respond_to?(:perform) || block_given?
         raise ArgumentError, 'Cannot enqueue items which do not respond to perform'
       end
-    
-      priority = args.first || 0
+
+      priority = args[0] || 0
       run_at   = args[1]
 
       Job.create(:payload_object => object, :priority => priority.to_i, :run_at => run_at)
@@ -120,80 +107,88 @@ module Delayed
 
     # Find a few candidate jobs to run (in case some immediately get locked by others).
     def self.find_available(limit = 5, max_run_time = MAX_RUN_TIME)
-
       time_now = db_time_now
+      sql = ''
+      conditions = []
+
+      # 1) not scheduled in the future
+      sql << '(run_at <= ?)'
+      conditions << time_now
+
+      # 2) and job is not failed yet
+      sql << ' AND (failed_at IS NULL)'
+
+      # 3a) and already locked by same worker
+      sql << ' AND ('
+      sql << '(locked_by = ?)'
+      conditions << Worker.name
 
-      sql = NextTaskSQL.dup
+      # 3b) or not locked yet
+      sql << ' OR (locked_at IS NULL)'
 
-      conditions = [time_now, time_now - max_run_time, worker_name]
+      # 3c) or lock expired
+      sql << ' OR (locked_at < ?)'
+      sql << ')'
+      conditions << time_now - max_run_time
 
-      if self.min_priority
+      if Worker.min_priority
         sql << ' AND (priority >= ?)'
-        conditions << min_priority
+        conditions << Worker.min_priority
       end
 
-      if self.max_priority
+      if Worker.max_priority
         sql << ' AND (priority <= ?)'
-        conditions << max_priority
+        conditions << Worker.max_priority
       end
 
-      if self.job_types
+      if Worker.job_types
         sql << ' AND (job_type IN (?))'
-        conditions << job_types
+        conditions << Worker.job_types
       end
 
       conditions.unshift(sql)
-
-      ActiveRecord::Base.silence do
-        find(:all, :conditions => conditions, :order => NextTaskOrder, :limit => limit)
-      end
+      find(:all, :conditions => conditions, :order => 'priority ASC, run_at ASC', :limit => limit)
     end
 
     # Run the next job we can get an exclusive lock on.
     # If no jobs are left we return nil
     def self.reserve_and_run_one_job(max_run_time = MAX_RUN_TIME)
 
-      # We get up to 5 jobs from the db. In case we cannot get exclusive access to a job we try the next.
+      # We get up to 20 jobs from the db. In case we cannot get exclusive access to a job we try the next.
       # this leads to a more even distribution of jobs across the worker processes
-      find_available(5, max_run_time).each do |job|
-        t = job.run_with_lock(max_run_time, worker_name)
+      find_available(20, max_run_time).each do |job|
+        t = job.run_with_lock(max_run_time, Worker.name)
         return t unless t == nil  # return if we did work (good or bad)
       end
 
-      nil # we didn't do any work, all 5 were not lockable
+      nil # we didn't do any work, all 20 were not lockable
     end
 
     # Lock this job for this worker.
     # Returns true if we have the lock, false otherwise.
-    def lock_exclusively!(max_run_time, worker = worker_name)
+    def lock_exclusively!(max_run_time = MAX_RUN_TIME, worker_name = Worker.name)
       now = self.class.db_time_now
-      affected_rows = if locked_by != worker
+      affected_rows = if locked_by != worker_name
         # We don't own this job so we will update the locked_by name and the locked_at
-        self.class.update_all(["locked_at = ?, locked_by = ?", now, worker], ["id = ? and (locked_at is null or locked_at < ?)", id, (now - max_run_time.to_i)])
+        self.class.update_all(["locked_at = ?, locked_by = ?", now, worker_name], ["id = ? and (locked_at is null or locked_at < ?) and (run_at <= ?)", id, (now - max_run_time.to_i), now])
       else
         # We already own this job, this may happen if the job queue crashes.
         # Simply resume and update the locked_at
-        self.class.update_all(["locked_at = ?", now], ["id = ? and locked_by = ?", id, worker])
+        self.class.update_all(["locked_at = ?", now], ["id = ? and locked_by = ?", id, worker_name])
       end
       if affected_rows == 1
         self.locked_at    = now
-        self.locked_by    = worker
+        self.locked_by    = worker_name
         return true
       else
         return false
       end
     end
 
-    # Unlock this job (note: not saved to DB)
-    def unlock
-      self.locked_at    = nil
-      self.locked_by    = nil
-    end
-
     # This is a good hook if you need to report job processing errors in additional or different ways
-    def log_exception(error)
-      logger.error "* [JOB] #{name} failed with #{error.class.name}: #{error.message} - #{attempts} failed attempts"
-      logger.error(error)
+    def log_exception(e)
+      Worker.logger.error("! [#{Worker.name}] #{name} failed with #{e.class.name}: #{e.message} - #{attempts} failed attempts")
+      Worker.logger.error(e)
     end
 
     # Do num jobs and return stats on success/failure.
@@ -221,7 +216,20 @@ module Delayed
       payload_object.perform
     end
 
-  private
+    # Get the current time (GMT or local depending on DB)
+    # Note: This does not ping the DB to get the time, so all your clients
+    # must have syncronized clocks.
+    def self.db_time_now
+      if Time.zone
+        Time.zone.now
+      elsif ActiveRecord::Base.default_timezone == :utc
+        Time.now.utc
+      else
+        Time.now
+      end
+    end
+
+   private
 
     def deserialize(source)
       handler = YAML.load(source) rescue nil
@@ -237,7 +245,7 @@ module Delayed
       return handler if handler.respond_to?(:perform)
 
       raise DeserializationError,
-        'Job failed to load: Unknown handler. Try to manually require the appropiate file.'
+        'Job failed to load: Unknown handler. Try to manually require the appropriate file.'
     rescue TypeError, LoadError, NameError => e
       raise DeserializationError,
         "Job failed to load: #{e.message}. Try to manually require the required file."
@@ -249,25 +257,6 @@ module Delayed
        klass.constantize
     end
 
-    # Get the current time (GMT or local depending on DB)
-    # Note: This does not ping the DB to get the time, so all your clients
-    # must have syncronized clocks.
-    def self.db_time_now
-      if Time.zone
-        Time.zone.now
-      elsif ActiveRecord::Base.default_timezone == :utc
-        Time.now.utc
-      else
-        Time.now
-      end
-    end
-
-  protected
-
-    def before_save
-      self.run_at ||= self.class.db_time_now
-    end
-
   end
 
   class EvaledJob