From b0cb54ec9fd7eae82d6e66558bcd4a667521dae6 Mon Sep 17 00:00:00 2001 From: Justin Ko Date: Fri, 3 Feb 2012 11:25:30 -0700 Subject: [PATCH] Set logger to Rails.logger if Rails is available. --- lib/paperclip/railtie.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/paperclip/railtie.rb b/lib/paperclip/railtie.rb index 18624c987..d691daeb8 100644 --- a/lib/paperclip/railtie.rb +++ b/lib/paperclip/railtie.rb @@ -18,6 +18,8 @@ class Railtie < Rails::Railtie class Railtie def self.insert + Paperclip.options[:logger] = Rails.logger if defined?(Rails) + if defined?(ActiveRecord) ActiveRecord::Base.send(:include, Paperclip::Glue) Paperclip.options[:logger] = ActiveRecord::Base.logger @@ -25,8 +27,6 @@ def self.insert ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, Paperclip::Schema) ActiveRecord::ConnectionAdapters::Table.send(:include, Paperclip::Schema) ActiveRecord::ConnectionAdapters::TableDefinition.send(:include, Paperclip::Schema) - else - Paperclip.options[:logger] = Rails.logger end File.send(:include, Paperclip::Upfile)