diff options
author | Fabio Papa <fabtheman@gmail.com> | 2019-07-12 17:10:20 +0000 |
---|---|---|
committer | Fabio Papa <fabtheman@gmail.com> | 2019-07-12 17:10:20 +0000 |
commit | 6457d5edb7d66df5dd3d5ba1f1ea0c56a59287a8 (patch) | |
tree | c683e3d7ebcf3e188f1dd85b8701ff972e7f8a3d /config/initializers/active_record_verbose_query_logs.rb | |
parent | 9b176c65159e4186f79eae2107af80e69132ba09 (diff) | |
parent | 740288f80d85210ada3eccc0f98e0843b2917d65 (diff) | |
download | gitlab-ce-6457d5edb7d66df5dd3d5ba1f1ea0c56a59287a8.tar.gz |
Merge branch 'master' into 'maintainers-can-create-subgroup'
# Conflicts:
# doc/user/permissions.md
Diffstat (limited to 'config/initializers/active_record_verbose_query_logs.rb')
-rw-r--r-- | config/initializers/active_record_verbose_query_logs.rb | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/config/initializers/active_record_verbose_query_logs.rb b/config/initializers/active_record_verbose_query_logs.rb deleted file mode 100644 index 1c5fbc8e830..00000000000 --- a/config/initializers/active_record_verbose_query_logs.rb +++ /dev/null @@ -1,56 +0,0 @@ -# frozen_string_literal: true - -# This is backport of https://github.com/rails/rails/pull/26815/files -# Enabled by default for every non-production environment - -module ActiveRecord - class LogSubscriber - module VerboseQueryLogs - def debug(progname = nil, &block) - return unless super - - log_query_source - end - - def log_query_source - source_line, line_number = extract_callstack(caller_locations) - - if source_line - if defined?(::Rails.root) - app_root = "#{::Rails.root}/".freeze - source_line = source_line.sub(app_root, "") - end - - logger.debug(" ↳ #{source_line}:#{line_number}") - end - end - - def extract_callstack(callstack) - line = callstack.find do |frame| - frame.absolute_path && !ignored_callstack(frame.absolute_path) - end - - offending_line = line || callstack.first - [ - offending_line.path, - offending_line.lineno, - offending_line.label - ] - end - - LOG_SUBSCRIBER_FILE = ActiveRecord::LogSubscriber.method(:logger).source_location.first - RAILS_GEM_ROOT = File.expand_path("../../../..", LOG_SUBSCRIBER_FILE) + "/" - APP_CONFIG_ROOT = File.expand_path("..", __dir__) + "/" - - def ignored_callstack(path) - path.start_with?(APP_CONFIG_ROOT, RAILS_GEM_ROOT, RbConfig::CONFIG["rubylibdir"]) - end - end - - if Rails.version.start_with?("5.2") - raise "Remove this monkey patch: #{__FILE__}" - else - prepend(VerboseQueryLogs) unless Rails.env.production? - end - end -end |