From: Takeshi Umeda <noel.yoshiba@gmail.com>
Date: Wed, 5 May 2021 02:41:10 +0000 (+0900)
Subject: Fix how to change connection pool for rails 6 (#16158)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=25345c90ffb74a8231eae4a130c98b6eaad7ce36;p=mastodon.git

Fix how to change connection pool for rails 6 (#16158)

* Fix how to change connection pool for rails 6

* Fix to match the code elsewhere
---

diff --git a/lib/mastodon/search_cli.rb b/lib/mastodon/search_cli.rb
index 22a0acec8..c0491744b 100644
--- a/lib/mastodon/search_cli.rb
+++ b/lib/mastodon/search_cli.rb
@@ -53,7 +53,9 @@ module Mastodon
         index.specification.lock!
       end
 
-      ActiveRecord::Base.configurations[Rails.env]['pool'] = options[:concurrency] + 1
+      db_config = ActiveRecord::Base.configurations[Rails.env].dup
+      db_config['pool'] = options[:concurrency] + 1
+      ActiveRecord::Base.establish_connection(db_config)
 
       pool    = Concurrent::FixedThreadPool.new(options[:concurrency])
       added   = Concurrent::AtomicFixnum.new(0)