aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-09-28 16:40:45 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-09-28 16:40:45 -0700
commitc2ee6a079e36f2cd4e9857605385526fad93abf3 (patch)
tree6938131379d5b796405a795e521b06bccaa633d7
parent33434f69c44d622b760eca78c5631dfce8c4ad54 (diff)
parent260f96589076948d7f4b7200b34740ee671fe2c7 (diff)
downloadrails-c2ee6a079e36f2cd4e9857605385526fad93abf3.tar.gz
rails-c2ee6a079e36f2cd4e9857605385526fad93abf3.tar.bz2
rails-c2ee6a079e36f2cd4e9857605385526fad93abf3.zip
Merge pull request #12396 from arthurnn/cleanup_logsubs
Cleanup identitymap logger from LogSubscriber
-rw-r--r--activerecord/lib/active_record/log_subscriber.rb13
1 files changed, 2 insertions, 11 deletions
diff --git a/activerecord/lib/active_record/log_subscriber.rb b/activerecord/lib/active_record/log_subscriber.rb
index 0358a36b14..927fbab8f0 100644
--- a/activerecord/lib/active_record/log_subscriber.rb
+++ b/activerecord/lib/active_record/log_subscriber.rb
@@ -17,7 +17,7 @@ module ActiveRecord
def initialize
super
- @odd_or_even = false
+ @odd = false
end
def render_bind(column, value)
@@ -60,17 +60,8 @@ module ActiveRecord
debug " #{name} #{sql}#{binds}"
end
- def identity(event)
- return unless logger.debug?
-
- name = color(event.payload[:name], odd? ? CYAN : MAGENTA, true)
- line = odd? ? color(event.payload[:line], nil, true) : event.payload[:line]
-
- debug " #{name} #{line}"
- end
-
def odd?
- @odd_or_even = !@odd_or_even
+ @odd = !@odd
end
def logger