delayed_job_on_steroids 1.7.5 → 2.0.0

data/spec/worker_spec.rb

@@ -0,0 +1,15 @@
+require File.dirname(__FILE__) + '/database'
+
+describe Delayed::Worker do
+  it "is singleton" do
+    Delayed::Worker.included_modules.include?(Singleton).should == true
+  end
+
+  it "responds to methods moved from Job" do
+    Delayed::JobDeprecations.instance_methods.each do |m|
+      m = m.to_s.gsub("worker_", "").to_sym
+      Delayed::Worker.respond_to?(m).should == true
+      Delayed::Worker.instance.respond_to?(m).should == true
+    end
+  end
+end

data/tasks/jobs.rake

@@ -1 +1 @@
-require File.join(File.dirname(__FILE__), 'tasks')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'delayed_on_steroids', 'tasks'))

metadata

@@ -3,10 +3,10 @@ name: delayed_job_on_steroids
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 1
-  - 7
-  - 5
-  version: 1.7.5
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - "Tobias L\xC3\xBCtke"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 +03:00
+date: 2010-03-24 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,28 +39,33 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.textile
+- README.markdown
 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
+- spec/worker_spec.rb
 - tasks/jobs.rake
-- tasks/tasks.rb
 has_rdoc: true
 homepage: http://github.com/AlekSi/delayed_job_on_steroids
 licenses: []
@@ -96,3 +101,4 @@ test_files:
 - spec/job_spec.rb
 - spec/story_spec.rb
 - spec/database.rb
+- spec/worker_spec.rb

data/README.textile

@@ -1,129 +0,0 @@
-h1. 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 
-
-h2. Setup
-
-The library evolves around a delayed_jobs table which can be created by using:
-<pre><code>
-  script/generate delayed_job_migration
-</code></pre>
-
-The created table looks as follows: 
-
-<pre><code>
-  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   :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.timestamps
-  end
-</code></pre>
-
-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::Job.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:
-
-<pre><code>
-  # config/initializers/delayed_job_config.rb
-  Delayed::Job.destroy_failed_jobs = false
-  silence_warnings do
-    Delayed::Job.const_set("MAX_ATTEMPTS", 3)
-    Delayed::Job.const_set("MAX_RUN_TIME", 5.minutes)
-  end
-</code></pre>
-
-Note: If your error messages are long, consider changing last_error field to a :text instead of a :string (255 character limit).
-
-
-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. 
-
-<pre><code>
-  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))
-</code></pre>
-
-There is also a second way to get jobs in the queue: send_later. 
-
-<pre><code>
-  BatchImporter.new(Shop.find(1)).send_later(:import_massive_csv, massive_csv)
-</code></pre>
-
-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.
-                                                                                                                              
-                                                                                                                    
-h2. 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:
-  
-<pre><code>
-  #!/usr/bin/env ruby
-  require File.dirname(__FILE__) + '/../config/environment'
-  
-  Delayed::Worker.new.start  
-</code></pre>
-
-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. (TODO: put in an example)
-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:
-
-<pre><code>
-  Delayed::Worker.new(:job_types => "SimpleJob").start
-  Delayed::Worker.new(:job_types => ["SimpleJob", "NewsletterJob"]).start
-</pre></code>
-
-h3. Cleaning up
-
-You can invoke @rake jobs:clear@ to delete all jobs in the queue.
-
-h3. Changes
-
-* 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/lib/delayed/worker.rb

@@ -1,55 +0,0 @@
-module Delayed
-  class Worker
-    SLEEP = 5
-
-    cattr_accessor :logger
-    self.logger = if defined?(Merb::Logger)
-      Merb.logger
-    elsif defined?(RAILS_DEFAULT_LOGGER)
-      RAILS_DEFAULT_LOGGER
-    end
-
-    def initialize(options={})
-      @quiet = options[:quiet]
-      Delayed::Job.min_priority = options[:min_priority] if options.has_key?(:min_priority)
-      Delayed::Job.max_priority = options[:max_priority] if options.has_key?(:max_priority)
-      Delayed::Job.job_types    = options[:job_types]    if options.has_key?(:job_types)
-    end
-
-    def start
-      say "*** Starting job worker #{Delayed::Job.worker_name}"
-
-      trap('TERM') { say 'Exiting...'; $exit = true }
-      trap('INT')  { say 'Exiting...'; $exit = true }
-
-      loop do
-        result = nil
-
-        realtime = Benchmark.realtime do
-          result = Delayed::Job.work_off
-        end
-
-        count = result.sum
-
-        break if $exit
-
-        if count.zero?
-          sleep(SLEEP)
-        else
-          say "#{count} jobs processed at %.4f j/s, %d failed ..." % [count / realtime, result.last]
-        end
-
-        break if $exit
-      end
-
-    ensure
-      Delayed::Job.clear_locks!
-    end
-
-    def say(text)
-      puts text unless @quiet
-      logger.info text if logger
-    end
-
-  end
-end

data/lib/delayed_job.rb

@@ -1,13 +0,0 @@
-autoload :ActiveRecord, 'activerecord'
-
-require File.dirname(__FILE__) + '/delayed/message_sending'
-require File.dirname(__FILE__) + '/delayed/performable_method'
-require File.dirname(__FILE__) + '/delayed/job'
-require File.dirname(__FILE__) + '/delayed/worker'
-
-Object.send(:include, Delayed::MessageSending)   
-Module.send(:include, Delayed::MessageSending::ClassMethods)
-
-if defined?(Merb::Plugins)
-  Merb::Plugins.add_rakefiles File.dirname(__FILE__) / '..' / 'tasks' / 'tasks'
-end

data/tasks/tasks.rb

@@ -1,16 +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 (options: MIN_PRIORITY, MAX_PRIORITY, JOB_TYPES)."
-  task :work => [:merb_env, :environment] do
-    Delayed::Worker.new(:min_priority => ENV['MIN_PRIORITY'], :max_priority => ENV['MAX_PRIORITY'],
-      :job_types => ENV['JOB_TYPES']).start
-  end
-end