Commit 37385ddb by Prem Sichanugrist

Set the logger to be `AR::Base.logger` or `Rails.logger` when the gem is included to Rails

However, this will make sure that you can always change it to something else afterward.

There's currently no test for this, but after I've tried this with the `integration_test` branch, I can confirm that logs are written to `log/test.log` as it should.

Closes #581
parent 5c85095e
...@@ -2,19 +2,19 @@ ...@@ -2,19 +2,19 @@
source "http://rubygems.org" source "http://rubygems.org"
gem "sqlite3", "~>1.3.4"
gem "rails", "~> 2.3.12"
gem "activerecord", :require=>"active_record" gem "activerecord", :require=>"active_record"
gem "appraisal"
gem "aws-s3", :require=>"aws/s3"
gem "bundler"
gem "cocaine", "~>0.2" gem "cocaine", "~>0.2"
gem "rake" gem "fog"
gem "sprockets", "~> 2.0.0.beta.13", :require=>false
gem "shoulda"
gem "mime-types"
gem "jruby-openssl", :platform=>:jruby gem "jruby-openssl", :platform=>:jruby
gem "mime-types"
gem "mocha" gem "mocha"
gem "bundler" gem "rake"
gem "fog"
gem "appraisal"
gem "aws-s3", :require=>"aws/s3"
gem "rdoc", :require=>false gem "rdoc", :require=>false
gem "shoulda"
gem "sqlite3", "~>1.3.4"
gem "sprockets", "~> 2.0.0.beta.13", :require=>false
gem "rails", "~> 2.3.12"
...@@ -2,19 +2,19 @@ ...@@ -2,19 +2,19 @@
source "http://rubygems.org" source "http://rubygems.org"
gem "sqlite3", "~>1.3.4"
gem "rails", "~> 3.0.9"
gem "activerecord", :require=>"active_record" gem "activerecord", :require=>"active_record"
gem "appraisal"
gem "aws-s3", :require=>"aws/s3"
gem "bundler"
gem "cocaine", "~>0.2" gem "cocaine", "~>0.2"
gem "rake" gem "fog"
gem "sprockets", "~> 2.0.0.beta.13", :require=>false
gem "shoulda"
gem "mime-types"
gem "jruby-openssl", :platform=>:jruby gem "jruby-openssl", :platform=>:jruby
gem "mime-types"
gem "mocha" gem "mocha"
gem "bundler" gem "rake"
gem "fog"
gem "appraisal"
gem "aws-s3", :require=>"aws/s3"
gem "rdoc", :require=>false gem "rdoc", :require=>false
gem "shoulda"
gem "sqlite3", "~>1.3.4"
gem "sprockets", "~> 2.0.0.beta.13", :require=>false
gem "rails", "~> 3.0.9"
...@@ -2,19 +2,19 @@ ...@@ -2,19 +2,19 @@
source "http://rubygems.org" source "http://rubygems.org"
gem "sqlite3", "~>1.3.4"
gem "rails", "~> 3.1.0.rc5"
gem "activerecord", :require=>"active_record" gem "activerecord", :require=>"active_record"
gem "appraisal"
gem "aws-s3", :require=>"aws/s3"
gem "bundler"
gem "cocaine", "~>0.2" gem "cocaine", "~>0.2"
gem "rake" gem "fog"
gem "sprockets", "~> 2.0.0.beta.13", :require=>false
gem "shoulda"
gem "mime-types"
gem "jruby-openssl", :platform=>:jruby gem "jruby-openssl", :platform=>:jruby
gem "mime-types"
gem "mocha" gem "mocha"
gem "bundler" gem "rake"
gem "fog"
gem "appraisal"
gem "aws-s3", :require=>"aws/s3"
gem "rdoc", :require=>false gem "rdoc", :require=>false
gem "shoulda"
gem "sqlite3", "~>1.3.4"
gem "sprockets", "~> 2.0.0.beta.13", :require=>false
gem "rails", "~> 3.1.0.rc5"
...@@ -142,7 +142,7 @@ module Paperclip ...@@ -142,7 +142,7 @@ module Paperclip
end end
end end
# Log a paperclip-specific line. Uses ActiveRecord::Base.logger # Log a paperclip-specific line. This will logs to STDOUT
# by default. Set Paperclip.options[:log] to false to turn off. # by default. Set Paperclip.options[:log] to false to turn off.
def log message def log message
logger.info("[paperclip] #{message}") if logging? logger.info("[paperclip] #{message}") if logging?
......
...@@ -19,6 +19,8 @@ module Paperclip ...@@ -19,6 +19,8 @@ module Paperclip
def self.insert def self.insert
ActiveRecord::Base.send(:include, Paperclip::Glue) ActiveRecord::Base.send(:include, Paperclip::Glue)
File.send(:include, Paperclip::Upfile) File.send(:include, Paperclip::Upfile)
Paperclip.options[:logger] = defined?(ActiveRecord) ? ActiveRecord::Base.logger : Rails.logger
end end
end end
end end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment