DEV: Remove custom connection reaper.

Rails 6 fixed the reaper to use one thread to reap all the connection pools.
This commit is contained in:
Guo Xiang Tan
2020-05-21 14:32:41 +08:00
committed by Alan Guo Xiang Tan
parent fc97f7e0e7
commit 878f06f1fe
5 changed files with 2 additions and 65 deletions

View File

@ -660,7 +660,6 @@ module Discourse
Sidekiq.redis_pool.shutdown { |c| nil }
# re-establish
Sidekiq.redis = sidekiq_redis_config
start_connection_reaper
# in case v8 was initialized we want to make sure it is nil
PrettyText.reset_context
@ -743,40 +742,6 @@ module Discourse
STDERR.puts "Failed to report exception #{e} #{message}"
end
def self.start_connection_reaper
return if GlobalSetting.connection_reaper_age < 1 ||
GlobalSetting.connection_reaper_interval < 1
# this helps keep connection counts in check
Thread.new do
while true
begin
sleep GlobalSetting.connection_reaper_interval
reap_connections(GlobalSetting.connection_reaper_age)
rescue => e
Discourse.warn_exception(e, message: "Error reaping connections")
end
end
end
end
def self.reap_connections(idle)
pools = []
ObjectSpace.each_object(ActiveRecord::ConnectionAdapters::ConnectionPool) { |pool| pools << pool }
pools.each do |pool|
# reap recovers connections that were aborted
# eg a thread died or a dev forgot to check it in
# flush removes idle connections
# after fork we have "deadpools" so ignore them, they have been discarded
# so @connections is set to nil
if pool.connections
pool.reap
pool.flush(idle)
end
end
end
def self.deprecate(warning, drop_from: nil, since: nil, raise_error: false, output_in_test: false)
location = caller_locations[1].yield_self { |l| "#{l.path}:#{l.lineno}:in \`#{l.label}\`" }
warning = ["Deprecation notice:", warning]