1 files changed, 6 insertions, 15 deletions
diff --git a/activerecord/lib/active_record/log_subscriber.rb b/activerecord/lib/active_record/log_subscriber.rb
index c7ae12977a..d7b99d796d 100644
--- a/activerecord/lib/active_record/log_subscriber.rb
+++ b/activerecord/lib/active_record/log_subscriber.rb
@@ -1,25 +1,12 @@
 module ActiveRecord
   class LogSubscriber < ActiveSupport::LogSubscriber
-    def self.runtime=(value)
-      Thread.current["active_record_sql_runtime"] = value
-    end
-
-    def self.runtime
-      Thread.current["active_record_sql_runtime"] ||= 0
-    end
-
-    def self.reset_runtime
-      rt, self.runtime = runtime, 0
-      rt
-    end
-
     def initialize
       super
       @odd_or_even = false
     end
 
     def sql(event)
-      self.class.runtime += event.duration
+      connection.runtime += event.duration
       return unless logger.debug?
 
       name = '%s (%.1fms)' % [event.payload[:name], event.duration]
@@ -39,10 +26,14 @@ module ActiveRecord
       @odd_or_even = !@odd_or_even
     end
 
+    def connection
+      ActiveRecord::Base.connection
+    end
+
     def logger
       ActiveRecord::Base.logger
     end
   end
 end
 
-ActiveRecord::LogSubscriber.attach_to :active_record
-\ No newline at end of file
+ActiveRecord::LogSubscriber.attach_to :active_record