lib/remnant/base.rb in remnant-0.4.3 vs lib/remnant/base.rb in remnant-0.4.4

- old
+ new

@@ -26,32 +26,11 @@ def collect @sample_counter ||= 0 extra_remnant_key = Remnant::Discover.results.delete(:extra_remnant_key) - if ::Rails.env.production? || ::Rails.env.staging? || ::Rails.env.demo? - # only log if above sample rate - if @sample_counter > configuration.sample_rate - key_prefix = [ - Remnant.configuration.tag, - Remnant.configuration.env, - extra_remnant_key - ].compact.join('.') - - Remnant::Discover.results.map do |remnant_key, ms| - Remnant.handler.timing("#{key_prefix}.#{remnant_key}", ms.to_i) - end - - Remnant.handler.timing("#{key_prefix}.gc", Remnant::GC.time.to_i) - Remnant.handler.timing("#{key_prefix}.db", Remnant::Database.total_time.to_i) - Remnant.handler.timing("#{key_prefix}.filters", Remnant::Filters.total_time.to_i) - - @sample_counter = 0 - else - @sample_counter += 1 - end - else + if ::Rails.env.development? || ::Rails.env.test? # always log in development mode Rails.logger.info "#{color(false, true)}--------------Remnants Discovered--------------#{color(true)}" Remnant::Discover.results.map do |remnant_key, ms| key = [ @@ -89,9 +68,30 @@ Rails.logger.info("#{color}%.2fms#{color(true)}\t#{query.sql}" % (query.time * 1000)) end end Rails.logger.info "#{color(false, true)}-----------------------------------------------#{color(true)}" + else + # only log if above sample rate + if @sample_counter > configuration.sample_rate + key_prefix = [ + Remnant.configuration.tag, + Remnant.configuration.env, + extra_remnant_key + ].compact.join('.') + + Remnant::Discover.results.map do |remnant_key, ms| + Remnant.handler.timing("#{key_prefix}.#{remnant_key}", ms.to_i) + end + + Remnant.handler.timing("#{key_prefix}.gc", Remnant::GC.time.to_i) + Remnant.handler.timing("#{key_prefix}.db", Remnant::Database.total_time.to_i) + Remnant.handler.timing("#{key_prefix}.filters", Remnant::Filters.total_time.to_i) + + @sample_counter = 0 + else + @sample_counter += 1 + end end # run hook if given unless Remnant.configuration.custom_hook.nil? Remnant.configuration.custom_hook.call(Remnant::Discover.results)