blaxter-delayed_job 2.0.5 → 2.0.6

data/VERSION

@@ -1 +1 @@
-2.0.5
+2.0.6

data/lib/delayed/job.rb

@@ -53,10 +53,9 @@ module Delayed
         Job.create(:payload_object => object, :priority => priority.to_i, :run_at => run_at)
       end
 
-      # Find a few candidate jobs to run (in case some immediately get locked by others).
-      # Return in random order prevent everyone trying to do same head job at once.
-      def find_available( options = {} )
-        limit        = options[:limit]        || 5
+      # Conditions used for find_available method. This is in a separated method to be able to override
+      # (or method chain it) more easy so you can customize the behaviour of your workers.
+      def conditions_available(options = {})
         max_run_time = options[:max_run_time] || MAX_RUN_TIME
         worker_name  = options[:worker_name]  || Worker::DEFAULT_WORKER_NAME
 
@@ -83,9 +82,14 @@ module Delayed
           conditions << "%#{options[:only_for]}%"
         end
         conditions.unshift(sql)
+      end
 
+      # Find a few candidate jobs to run (in case some immediately get locked by others).
+      # Return in random order prevent everyone trying to do same head job at once.
+      def find_available(options = {})
+        limit = options[:limit] || 5
         ActiveRecord::Base.silence do
-          find(:all, :conditions => conditions, :order => NextTaskOrder, :limit => limit)
+          find :all, :conditions => conditions_available(options), :order => NextTaskOrder, :limit => limit
         end
       end
 

data/lib/delayed/worker.rb

@@ -44,11 +44,12 @@ module Delayed
     #   - job_types: constraint for selecting what jobs to execute (String or Array)
     def initialize(options={})
       [ :quiet, :name, :min_priority, :max_priority, :job_types, :only_for ].each do |attr_name|
-        send "#{attr_name}=", options[attr_name]
+        send "#{attr_name}=", options.delete(attr_name)
       end
       # Default values
       self.name  = DEFAULT_WORKER_NAME if self.name.nil?
       self.quiet = true                if self.quiet.nil?
+      @options = options
     end
 
     def start
@@ -61,7 +62,7 @@ module Delayed
         result = nil
 
         realtime = Benchmark.realtime do
-          result = Job.work_off( constraints )
+          result = Job.work_off constraints.merge(@options)
         end
 
         count = result.sum

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 5
-  version: 2.0.5
+  - 6
+  version: 2.0.6
 platform: ruby
 authors: 
 - "Tobias L\xC3\xBCtke"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-22 00:00:00 +02:00
+date: 2010-05-03 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -28,12 +28,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .gitignore
 - MIT-LICENSE
-- README.markdown
-- Rakefile
 - VERSION
-- delayed_job.gemspec
 - generators/delayed_job/delayed_job_generator.rb
 - generators/delayed_job/templates/migration.rb
 - init.rb
@@ -42,12 +38,6 @@ files:
 - lib/delayed/performable_method.rb
 - lib/delayed/worker.rb
 - lib/delayed_job.rb
-- spec/database.rb
-- spec/delayed_method_spec.rb
-- spec/job_spec.rb
-- spec/story_spec.rb
-- tasks/jobs.rake
-- tasks/tasks.rb
 has_rdoc: true
 homepage: http://github.com/blaxter/delayed_job
 licenses: []

data/.gitignore

@@ -1,2 +0,0 @@
-*.gem
-blaxter-delayed_job.gemspec

data/README.markdown

@@ -1,202 +0,0 @@
-Delayed::Job
-============
-
-Delayed_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background.
-
-It is a direct extraction from Shopify where the job table is responsible for a multitude of core tasks. Amongst those tasks are:
-
-* sending massive newsletters
-* image resizing
-* http downloads
-* updating smart collections
-* updating solr, our search server, after product changes
-* batch imports
-* spam checks
-
-What is this fork for?
-----------------------
-
-My purpose with this fork is make delayed_job for flexible. That's means you can customize how your workers behave.
-
-The common use will be to have several workers running concurrently (in one process) and each one with differents constraints so they'll run different kind of jobs.
-
-
-Setup
------
-
-The library evolves around a delayed_jobs table which looks as follows:
-
-    create_table :delayed_jobs, :force => true do |table|
-        table.integer  :priority, :default => 0      # Allows some jobs to jump to the front of the queue
-        table.integer  :attempts, :default => 0      # Provides for retries, but still fail eventually.
-        table.text     :handler                      # YAML-encoded string of the object that will do work
-        table.string   :job_type                     # Class name of the job object, for type-specific workers
-        table.string   :name                         # The display name, an informative field or can be use to filter jobs
-        table.string   :last_error                   # reason for last failure (See Note below)
-        table.datetime :run_at                       # When to run. Could be Time.now for immediately, or sometime in the future.
-        table.datetime :locked_at                    # Set when a client is working on this object
-        table.datetime :failed_at                    # Set when all retries have failed (actually, by default, the record is deleted instead)
-        table.string   :locked_by                    # Who is working on this object (if locked)
-        table.datetime :finished_at			 # Used for statiscics / monitoring
-        table.timestamps
-    end
-
-You can generate the migration executing:
-
-    $ script/generate delayed_job
-      exists  db/migrate
-      create  db/migrate/20090807090217_create_delayed_jobs.rb
-
-
-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 (jobs can override this value by responding to `:max_attempts`). 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. If you want to keep failed jobs, set `Delayed::Job.destroy_failed_jobs = false`. The failed jobs will be marked with non-null failed_at.
-
-Same thing for successful jobs. They're deleted by default and, to keep them, set `Delayed::Job.destroy_successful_jobs = false`. They will be marked with finished_at. This is useful for gathering statistics like how long jobs took between entering the queue (created_at) and being finished (finished_at).
-
-You have several named scopes for searching unfinished/finsihed/failed jobs, very useful when destroy_successful_jobs is false `Delayed::Job.unfinished`, `Delayed::Job.finsihed`, `Delayed::Job.failed`.
-
-Here is an example of changing job parameters in Rails:
-
-    # config/initializers/delayed_job_config.rb
-    Delayed::Job.destroy_failed_jobs     = false
-    Delayed::Job.destroy_successful_jobs = false
-    silence_warnings do
-      Delayed::Job.const_set("MAX_ATTEMPTS", 3)
-      Delayed::Job.const_set("MAX_RUN_TIME", 5.hours)
-
-      Delayed::Worker.const_set("SLEEP", 5.minutes.to_i)
-    end
-
-Note: If your error messages are long, consider changing last_error field to a :text instead of a :string (255 character limit).
-
-
-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)
-
-And also you can specified priority as second parameter and the time the job should execute as thrird one
-
-
-    class FooJob
-      def perform
-        ...
-      end
-    end
-
-    important_job = FooJob.new
-    normal_job    = FooJob.new
-
-    # Delayed::Job.enqueue( job, priority, start_at )
-    Delayed::Job.enqueue important_job, 100
-    Delayed::Job.enqueue normal_job, 1, 2.hours.from_now
-
-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.
-
-
-Running the jobs
-----------------
-
-You can invoke `rake jobs:work` which will start working off jobs. You can cancel the rake task with `CTRL-C`.
-
-You can also run by writing a simple `script/job_runner`, and invoking it externally:
-
-
-    require File.dirname(__FILE__) + '/../config/environment'
-
-    Delayed::Worker.new.start
-
-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.
-
-
-    require File.dirname(__FILE__) + '/../config/environment'
-    N = 10
-    workers = []
-    N.times do |n|
-    workers << Thread.new do
-      Delayed::Worker.new( :name => "Worker #{n}" ).start
-    end
-    end
-
-    workers.first.join # wait until finish (signal catched)
-
-Keep in mind that each worker will check the database at least every 5 seconds.
-
-Note: The rake task will exit if the database has any network connectivity problems.
-
-If you only want to run specific types of jobs in a given worker, include them when initializing the worker:
-
-    Delayed::Worker.new(:job_types => "SimpleJob").start
-    Delayed::Worker.new(:job_types => ["SimpleJob", "NewsletterJob"]).start
-
-Also for a more specific restriction you can define in your job's classes a `display_name` method, and create workers to specific kind of jobs
-
-    # 1 - The job class that does the real work
-    class MyJob
-      def initialize( data )
-        @some_data = data
-      end
-
-      def perform
-        # do the real work
-      end
-
-      def display_name
-        "foobar #{@some_data}"
-      end
-    end
-
-    # 2 - Enqueue jobs
-    Delayed::Job.enqueue MyJob.new("foobar")
-    Delayed::Job.enqueue MyJob.new("arrrr")
-
-    # 3 - Create workers, one for each type of "data"
-    Thread.new {
-      # This worker will only perform jobs which display name is like "%foobar%"
-      Delayed::Worker.new :name => "Worker for foobar", :only_for => "foobar"
-    }
-    Thread.new {
-      Delayed::Worker.new :name => "Worker for arrr", :only_for => "arrr"
-    }
-
-
-Cleaning up
------------
-
-You can invoke `rake jobs:clear` to delete all jobs in the queue.
-
-Changes
--------
-* 2.0.4: Add `Delayed::HIDE_BACKTRACE` for showing only the first line of the errors avoiding long backtraces
-* 2.0.3: The only_for feature wasn't working at all
-* 2.0.2: Only update run_at when it's gonna be executed another time for sure (attempts < max_attempts)
-* 2.0.1: named_scope Delayed::Job.failed/finished/unfinished (jobs that have failed, have finished ok or still haven't been done)
-* 2.0.0: Contains the changes made in this fork, the ability to create workers with individual constraints without interfere to other workers
-
-* 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,38 +0,0 @@
-# -*- encoding: utf-8 -*-
-begin
-  require 'jeweler'
-
-  Jeweler::Tasks.new do |s|
-    s.name     = "blaxter-delayed_job"
-    s.summary  = "Database-backed asynchronous priority queue system -- Extracted from Shopify"
-    s.email    = "blaxter@gmail.com"
-    s.homepage = "http://github.com/blaxter/delayed_job"
-    s.description = "Delayed_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background. It is a direct extraction from Shopify where the job table is responsible for a multitude of core tasks."
-    s.authors  = ["Tobias Lütke", "Jesús García Sáez"]
-
-    s.has_rdoc = true
-    s.rdoc_options = ["--main", "README.textile", "--inline-source", "--line-numbers"]
-    s.extra_rdoc_files = ["README.textile"]
-
-    s.test_files = Dir['spec/**/*']
-  end
-
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-  exit 1
-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(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-
-task :default => :spec

data/delayed_job.gemspec

@@ -1,58 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{delayed_job}
-  s.version = "2.0.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Tobias L\303\274tke"]
-  s.date = %q{2010-03-22}
-  s.description = %q{Delayed_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background. It is a direct extraction from Shopify where the job table is responsible for a multitude of core tasks.}
-  s.email = %q{tobi@leetsoft.com}
-  s.files = [
-    ".gitignore",
-     "MIT-LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "delayed_job.gemspec",
-     "generators/delayed_job/delayed_job_generator.rb",
-     "generators/delayed_job/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",
-     "spec/database.rb",
-     "spec/delayed_method_spec.rb",
-     "spec/job_spec.rb",
-     "spec/story_spec.rb",
-     "tasks/jobs.rake",
-     "tasks/tasks.rb"
-  ]
-  s.homepage = %q{http://github.com/tobi/delayed_job/tree/master}
-  s.rdoc_options = ["--main", "README.textile", "--inline-source", "--line-numbers"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Database-backed asynchronous priority queue system -- Extracted from Shopify}
-  s.test_files = [
-    "spec/delayed_method_spec.rb",
-     "spec/story_spec.rb",
-     "spec/database.rb",
-     "spec/job_spec.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end

data/tasks/jobs.rake

@@ -1 +0,0 @@
-require File.join(File.dirname(__FILE__), 'tasks')

data/tasks/tasks.rb

@@ -1,15 +0,0 @@
-# Re-definitions are appended to existing tasks
-task :environment
-task :merb_env
-
-namespace :jobs do
-  desc "Clear the delayed_job queue."
-  task :clear => [:merb_env, :environment] do
-    Delayed::Job.delete_all
-  end
-
-  desc "Start a delayed_job worker."
-  task :work => [:merb_env, :environment] do
-    Delayed::Worker.new(:min_priority => ENV['MIN_PRIORITY'], :max_priority => ENV['MAX_PRIORITY']).start
-  end
-end