From a6d71720cd4c3197044a4f85a632b8778c720ded Mon Sep 17 00:00:00 2001 From: Joseph Shraibman Date: Tue, 15 Jan 2013 17:01:20 -0500 Subject: [PATCH] Fix issue #382 --- lib/delayed/railtie.rb | 6 ++++++ lib/delayed/worker.rb | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/delayed/railtie.rb b/lib/delayed/railtie.rb index 19567c18f..215657cef 100644 --- a/lib/delayed/railtie.rb +++ b/lib/delayed/railtie.rb @@ -7,6 +7,12 @@ class Railtie < Rails::Railtie ActiveSupport.on_load(:action_mailer) do ActionMailer::Base.send(:extend, Delayed::DelayMail) end + + Delayed::Worker.logger = if defined?(Rails) + Rails.logger + elsif defined?(RAILS_DEFAULT_LOGGER) + RAILS_DEFAULT_LOGGER + end end rake_tasks do diff --git a/lib/delayed/worker.rb b/lib/delayed/worker.rb index 573260513..c42f38f70 100644 --- a/lib/delayed/worker.rb +++ b/lib/delayed/worker.rb @@ -47,12 +47,6 @@ def self.reset # (perhaps to inspect the reason for the failure), set this to false. self.destroy_failed_jobs = true - self.logger = if defined?(Rails) - Rails.logger - elsif defined?(RAILS_DEFAULT_LOGGER) - RAILS_DEFAULT_LOGGER - end - def self.backend=(backend) if backend.is_a? Symbol require "delayed/serialization/#{backend}"