delayed_job 2.0.2 → 2.0.3

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.3

data/benchmarks.rb

@@ -4,6 +4,8 @@ require 'logger'
 require 'delayed_job'
 require 'benchmark'
 
+RAILS_ENV = 'test'
+
 Delayed::Worker.logger = Logger.new('/dev/null')
 
 BACKENDS = []

data/contrib/delayed_job_multiple.monitrc

@@ -0,0 +1,23 @@
+# an example Monit configuration file for delayed_job running multiple processes
+#
+# To use:
+# 1. copy to /var/www/apps/{app_name}/shared/delayed_job.monitrc
+# 2. replace {app_name} as appropriate
+# 3. add this to your /etc/monit/monitrc
+#
+#   include /var/www/apps/{app_name}/shared/delayed_job.monitrc
+
+check process delayed_job_0
+  with pidfile /var/www/apps/{app_name}/shared/pids/delayed_job.0.pid
+  start program = "/usr/bin/env RAILS_ENV=production /var/www/apps/{app_name}/current/script/delayed_job start -i 0"
+  stop program = "/usr/bin/env RAILS_ENV=production /var/www/apps/{app_name}/current/script/delayed_job stop -i 0"
+  
+check process delayed_job_1
+  with pidfile /var/www/apps/{app_name}/shared/pids/delayed_job.1.pid
+  start program = "/usr/bin/env RAILS_ENV=production /var/www/apps/{app_name}/current/script/delayed_job start -i 1"
+  stop program = "/usr/bin/env RAILS_ENV=production /var/www/apps/{app_name}/current/script/delayed_job stop -i 1"
+  
+check process delayed_job_2
+  with pidfile /var/www/apps/{app_name}/shared/pids/delayed_job.2.pid
+  start program = "/usr/bin/env RAILS_ENV=production /var/www/apps/{app_name}/current/script/delayed_job start -i 2"
+  stop program = "/usr/bin/env RAILS_ENV=production /var/www/apps/{app_name}/current/script/delayed_job stop -i 2"

data/delayed_job.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{delayed_job}
-  s.version = "2.0.2"
+  s.version = "2.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brandon Keepers", "Tobias L\303\274tke"]
-  s.date = %q{2010-04-08}
+  s.date = %q{2010-04-16}
   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.
 
 This gem is collectiveidea's fork (http://github.com/collectiveidea/delayed_job).}
@@ -25,6 +25,7 @@ This gem is collectiveidea's fork (http://github.com/collectiveidea/delayed_job)
      "VERSION",
      "benchmarks.rb",
      "contrib/delayed_job.monitrc",
+     "contrib/delayed_job_multiple.monitrc",
      "delayed_job.gemspec",
      "generators/delayed_job/delayed_job_generator.rb",
      "generators/delayed_job/templates/migration.rb",
@@ -42,6 +43,7 @@ This gem is collectiveidea's fork (http://github.com/collectiveidea/delayed_job)
      "lib/delayed/tasks.rb",
      "lib/delayed/worker.rb",
      "lib/delayed_job.rb",
+     "rails/init.rb",
      "recipes/delayed_job.rb",
      "spec/backend/active_record_job_spec.rb",
      "spec/backend/data_mapper_job_spec.rb",

data/init.rb

@@ -1,5 +1 @@
-require 'delayed_job'
-
-config.after_initialize do
-  Delayed::Worker.guess_backend
-end
+require File.join(File.dirname(__FILE__), 'rails', 'init')

data/lib/delayed/command.rb

@@ -8,7 +8,10 @@ module Delayed
     
     def initialize(args)
       @files_to_reopen = []
-      @options = {:quiet => true}
+      @options = {
+        :quiet => true,
+        :pid_dir => "#{RAILS_ROOT}/tmp/pids"
+      }
       
       @worker_count = 1
       
@@ -31,6 +34,12 @@ module Delayed
         opts.on('-n', '--number_of_workers=workers', "Number of unique workers to spawn") do |worker_count|
           @worker_count = worker_count.to_i rescue 1
         end
+        opts.on('--pid-dir=DIR', 'Specifies an alternate directory in which to store the process ids.') do |dir|
+          @options[:pid_dir] = dir
+        end
+        opts.on('-i', '--identifier=n', 'A numeric identifier for the worker.') do |n|
+          @options[:identifier] = n
+        end
       end
       @args = opts.parse!(args)
     end
@@ -42,33 +51,41 @@ module Delayed
         @files_to_reopen << file unless file.closed?
       end
       
-      dir = "#{RAILS_ROOT}/tmp/pids"
+      dir = @options[:pid_dir]
       Dir.mkdir(dir) unless File.exists?(dir)
       
-      worker_count.times do |worker_index|
-        process_name = worker_count == 1 ? "delayed_job" : "delayed_job.#{worker_index}"
-        Daemons.run_proc(process_name, :dir => dir, :dir_mode => :normal, :ARGV => @args) do |*args|
-          run process_name
+      if @worker_count > 1 && @options[:identifier]
+        raise ArgumentError, 'Cannot specify both --number-of-workers and --identifier'
+      elsif @worker_count == 1 && @options[:identifier]
+        process_name = "delayed_job.#{@options[:identifier]}"
+        run_process(process_name, dir)
+      else
+        worker_count.times do |worker_index|
+          process_name = worker_count == 1 ? "delayed_job" : "delayed_job.#{worker_index}"
+          run_process(process_name, dir)
         end
       end
     end
     
+    def run_process(process_name, dir)
+      Daemons.run_proc(process_name, :dir => dir, :dir_mode => :normal, :ARGV => @args) do |*args|
+        run process_name
+      end
+    end
+    
     def run(worker_name = nil)
       Dir.chdir(RAILS_ROOT)
       
       # Re-open file handles
       @files_to_reopen.each do |file|
         begin
-          file.reopen File.join(RAILS_ROOT, 'log', 'delayed_job.log'), 'a+'
+          file.reopen file.path
           file.sync = true
         rescue ::Exception
         end
       end
       
-      Delayed::Worker.logger = Rails.logger
-      if Delayed::Worker.logger.respond_to? :auto_flushing=
-        Delayed::Worker.logger.auto_flushing = true
-      end
+      Delayed::Worker.logger = Logger.new(File.join(RAILS_ROOT, 'log', 'delayed_job.log'))
       Delayed::Worker.backend.after_fork
       
       worker = Delayed::Worker.new(@options)

data/rails/init.rb

@@ -0,0 +1,5 @@
+require 'delayed_job'
+
+config.after_initialize do
+  Delayed::Worker.guess_backend
+end

data/spec/setup/mongo_mapper.rb

@@ -1,7 +1,9 @@
 require 'mongo_mapper'
 
-MongoMapper.connection = Mongo::Connection.new nil, nil, :logger => Delayed::Worker.logger
-MongoMapper.database = 'delayed_job'
+MongoMapper.config = {
+  RAILS_ENV => {'database' => 'delayed_job'}
+}
+MongoMapper.connect RAILS_ENV
 
 unless defined?(Story)
   class Story

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require 'delayed_job'
 require 'sample_jobs'
 
 Delayed::Worker.logger = Logger.new('/tmp/dj.log')
+RAILS_ENV = 'test'
 
 # determine the available backends
 BACKENDS = []

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 2
-  version: 2.0.2
+  - 3
+  version: 2.0.3
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 -04:00
+date: 2010-04-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -157,6 +157,7 @@ files:
 - VERSION
 - benchmarks.rb
 - contrib/delayed_job.monitrc
+- contrib/delayed_job_multiple.monitrc
 - delayed_job.gemspec
 - generators/delayed_job/delayed_job_generator.rb
 - generators/delayed_job/templates/migration.rb
@@ -174,6 +175,7 @@ files:
 - lib/delayed/tasks.rb
 - lib/delayed/worker.rb
 - lib/delayed_job.rb
+- rails/init.rb
 - recipes/delayed_job.rb
 - spec/backend/active_record_job_spec.rb
 - spec/backend/data_mapper_job_spec.rb