mirror of
https://github.com/github/rails.git
synced 2026-01-06 21:34:08 -05:00
Move commit exception handling to a method so we can override
It looks like these methods all get included into the AbstractAdapter, and then in github/github we have our own Adapter as an internal gem. So this should be easy enough to override in our vendor'ed adapter. This will allow us to still grab errors that happen in `after_commit` which would normally be swallowed in Rails 3.0 (and beyond). Conflicts: activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
This commit is contained in:
committed by
Charlie Somerville
parent
c957f5f609
commit
0afd326c36
@@ -371,7 +371,7 @@ module ActiveRecord
|
||||
begin
|
||||
record.committed!
|
||||
rescue Exception => e
|
||||
record.logger.error(e) if record.respond_to?(:logger) && record.logger
|
||||
handle_commit_exceptions(record, e)
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -385,6 +385,11 @@ module ActiveRecord
|
||||
row = result.rows.first
|
||||
row && row.first
|
||||
end
|
||||
|
||||
# Handle any exceptions caught trying to send the commit message to a record
|
||||
def handle_commit_exceptions(record, e)
|
||||
record.logger.error(e) if record.respond_to?(:logger) && record.logger
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user