Fix issue #382

collectiveidea · Jan 15, 2013 · a6d7172 · a6d7172
1 parent a5ac868
commit a6d7172
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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}"