Merge remote-tracking branch 'origin/pr/468'

Conflicts: lib/delayed/worker.rb
collectiveidea · Sep 24, 2014 · acdda42 · acdda42
2 parents a8fc903 + a6d7172
commit acdda42
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.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
@@ -59,12 +59,6 @@ def self.reset
     cattr_accessor :raise_signal_exceptions
     self.raise_signal_exceptions = false
 
-    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}"