@@ -1,7 +1,6 @@ require 'rubygems' require 'daemons' require 'optparse' -require 'logger' module Delayed class Command @@ -45,10 +44,16 @@ module Delayed def run(worker_name = nil) Dir.chdir(RAILS_ROOT) - # Set the default logger - Object.const_set :RAILS_DEFAULT_LOGGER, Logger.new(File.join(RAILS_ROOT, 'log', 'delayed_job.log')) require File.join(RAILS_ROOT, 'config', 'environment') + + # Replace the default logger + logger = Logger.new(File.join(RAILS_ROOT, 'log', 'delayed_job.log')) + logger.level = ActiveRecord::Base.logger.level + ActiveRecord::Base.logger = logger + ActiveRecord::Base.clear_active_connections! + Delayed::Worker.logger = logger Delayed::Job.worker_name = "#{worker_name} #{Delayed::Job.worker_name}" + Delayed::Worker.new(@options).start rescue => e logger.fatal e lib/delayed/command.rb c43dba99dbe902c8b0629ae319c4041416d7caea Brandon Keepers brandon@collectiveidea.com http://github.com/collectiveidea/delayed_job/commit/7d94a006813572804f8bb09a8020f1a95e8906ab 7d94a006813572804f8bb09a8020f1a95e8906ab 2009-06-22T11:38:15-07:00 2009-06-22T11:38:15-07:00 Revert "Set RAILS_DEFAULT_LOGGER before loading Rails in the command line script", since we lose the log level by doing it this way This reverts commit c43dba99dbe902c8b0629ae319c4041416d7caea. af32fd7a36382783a37988940f139b2d7607b4f9 Brandon Keepers brandon@collectiveidea.com