delayed_job 1.8.2 → 1.8.3

data/README.textile

@@ -83,12 +83,12 @@ h2. Running Jobs
 @script/delayed_job@ can be used to manage a background process which will start working off jobs.
 
 <pre>
-$ ruby script/delayed_job -e production start
-$ ruby script/delayed_job -e production stop
+$ RAILS_ENV=production script/delayed_job start
+$ RAILS_ENV=production script/delayed_job stop
 
 # Runs two workers in separate processes.
-$ ruby script/delayed_job -e production -n 2 start
-$ ruby script/delayed_job -e production stop
+$ RAILS_ENV=production script/delayed_job -n 2 start
+$ RAILS_ENV=production script/delayed_job stop
 </pre>
 
 Workers can be running on any computer, as long as they have access to the database and their clock is in sync. Keep in mind that each worker will check the database at least every 5 seconds.

data/VERSION

@@ -1 +1 @@
-1.8.2
+1.8.3

data/contrib/delayed_job.monitrc

@@ -3,12 +3,12 @@
 #
 # To use:
 # 1. copy to /var/www/apps/{app_name}/shared/delayed_job.monitrc
-# 2. replace {app_name} and {environment} as appropriate
+# 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
   with pidfile /var/www/apps/{app_name}/shared/pids/delayed_job.pid
-  start program = "/var/www/apps/{app_name}/current/script/delayed_job -e {environment} start"
-  stop program = "/var/www/apps/{app_name}/current/script/delayed_job -e {environment} stop"
+  start program = "RAILS_ENV=production /var/www/apps/{app_name}/current/script/delayed_job start"
+  stop program = "RAILS_ENV=production /var/www/apps/{app_name}/current/script/delayed_job stop"

data/delayed_job.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{delayed_job}
-  s.version = "1.8.2"
+  s.version = "1.8.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{2009-09-22}
+  s.date = %q{2009-09-28}
   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.extra_rdoc_files = [
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/collectiveidea/delayed_job}
   s.rdoc_options = ["--main", "README.textile", "--inline-source", "--line-numbers"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Database-backed asynchronous priority queue system -- Extracted from Shopify}
   s.test_files = [
     "spec/database.rb",

data/lib/delayed/command.rb

@@ -7,7 +7,9 @@ module Delayed
     attr_accessor :worker_count
     
     def initialize(args)
+      @files_to_reopen = []
       @options = {:quiet => true}
+      
       @worker_count = 1
       
       opts = OptionParser.new do |opts|
@@ -18,7 +20,7 @@ module Delayed
           exit 1
         end
         opts.on('-e', '--environment=NAME', 'Specifies the environment to run this delayed jobs under (test/development/production).') do |e|
-          ENV['RAILS_ENV'] = e
+          STDERR.puts "The -e/--environment option has been deprecated and has no effect. Use RAILS_ENV and see http://github.com/collectiveidea/delayed_job/issues/#issue/7"
         end
         opts.on('--min-priority N', 'Minimum priority of jobs to run.') do |n|
           @options[:min_priority] = n
@@ -34,6 +36,10 @@ module Delayed
     end
   
     def daemonize
+      ObjectSpace.each_object(File) do |file|
+        @files_to_reopen << file unless file.closed?
+      end
+      
       worker_count.times do |worker_index|
         process_name = worker_count == 1 ? "delayed_job" : "delayed_job.#{worker_index}"
         Daemons.run_proc(process_name, :dir => "#{RAILS_ROOT}/tmp/pids", :dir_mode => :normal, :ARGV => @args) do |*args|
@@ -45,10 +51,15 @@ module Delayed
     def run(worker_name = nil)
       Dir.chdir(RAILS_ROOT)
       
-      # Replace the default logger…too bad Rails doesn't make this easier
-      Rails.logger.instance_eval do
-        @log.reopen File.join(RAILS_ROOT, 'log', 'delayed_job.log')
+      # Re-open file handles
+      @files_to_reopen.each do |file|
+        begin
+          file.reopen File.join(RAILS_ROOT, 'log', 'delayed_job.log'), 'w+'
+          file.sync = true
+        rescue ::Exception
+        end
       end
+      
       Delayed::Worker.logger = Rails.logger
       ActiveRecord::Base.connection.reconnect!
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: delayed_job
 version: !ruby/object:Gem::Version 
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-22 00:00:00 -04:00
+date: 2009-09-28 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Database-backed asynchronous priority queue system -- Extracted from Shopify