Drop patch which expected rails 5.2
This commit is contained in:
parent
4c65ba56e1
commit
094e408385
2 changed files with 0 additions and 62 deletions
61
debian/patches/0680-rails-5_2.patch
vendored
61
debian/patches/0680-rails-5_2.patch
vendored
|
@ -1,61 +0,0 @@
|
||||||
This monkey patch is not require with rails 5.2
|
|
||||||
|
|
||||||
--- 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
|
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -22,7 +22,6 @@
|
||||||
0660-fix-gitlab-yml-path.patch
|
0660-fix-gitlab-yml-path.patch
|
||||||
0670-allow-doorkeepr-4_3.patch
|
0670-allow-doorkeepr-4_3.patch
|
||||||
0680-rails-5_1.patch
|
0680-rails-5_1.patch
|
||||||
0680-rails-5_2.patch
|
|
||||||
0685-bump-fog.patch
|
0685-bump-fog.patch
|
||||||
0686-rails-5.1-embed.patch
|
0686-rails-5.1-embed.patch
|
||||||
0687-opentracing-embed.patch
|
0687-opentracing-embed.patch
|
||||||
|
|
Loading…
Reference in a new issue