diff options
Diffstat (limited to 'activerecord')
| -rwxr-xr-x | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/notifications.rb (renamed from activerecord/lib/active_record/instrument.rb) | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index b411fe7526..8fae26b790 100755 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -200,7 +200,7 @@ module ActiveRecord protected def log(sql, name, &block) - ActiveSupport::Orchestra.instrument(:sql, :sql => sql, :name => name, &block) + ActiveSupport::Notifications.instrument(:sql, :sql => sql, :name => name, &block) rescue Exception => e # Log message and raise exception. # Set last_verification to 0, so that connection gets verified diff --git a/activerecord/lib/active_record/instrument.rb b/activerecord/lib/active_record/notifications.rb index 06d3e40080..a5ce7ac524 100644 --- a/activerecord/lib/active_record/instrument.rb +++ b/activerecord/lib/active_record/notifications.rb @@ -1,5 +1,5 @@ -require 'active_support/orchestra' +require 'active_support/notifications' -ActiveSupport::Orchestra.subscribe("sql") do |event| +ActiveSupport::Notifications.subscribe("sql") do |event| ActiveRecord::Base.connection.log_info(event.payload[:sql], event.payload[:name], event.duration) end |