Skip to content

Commit 823c905

Browse files
authored
Merge pull request getsentry#638 from eugeneius/rails_logger
Use Rails logger by default again
2 parents 1aa9f1f + c2694bb commit 823c905

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

lib/raven/integrations/rails.rb

+4-1
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,13 @@ class Rails < ::Rails::Railtie
3232
end
3333
end
3434

35+
config.before_initialize do
36+
Raven.configuration.logger = ::Rails.logger
37+
end
38+
3539
config.after_initialize do
3640
Raven.configure do |config|
3741
config.project_root ||= ::Rails.root
38-
config.logger ||= ::Rails.logger
3942
config.release ||= config.detect_release # if project_root has changed, need to re-check
4043
end
4144

spec/raven/integrations/rails_spec.rb

+8-2
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,22 @@
66

77
describe TestApp, :type => :request do
88
before(:all) do
9-
Raven.configure do |config|
9+
@original_configuration = Raven.configuration
10+
11+
Raven.configuration = Raven::Configuration.new.tap do |config|
1012
config.dsn = 'dummy://12345:[email protected]:3000/sentry/42'
1113
config.encoding = 'json'
12-
config.logger = false
1314
end
15+
1416
Rails.logger = Logger.new(nil)
1517
Rails.env = "production"
1618
TestApp.initialize!
1719
end
1820

21+
after(:all) do
22+
Raven.configuration = @original_configuration
23+
end
24+
1925
after(:each) do
2026
Raven.client.transport.events = []
2127
end

0 commit comments

Comments
 (0)