erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Bump connection_pool from 2.3.0 to 2.4.0 (#24290)

Browse source 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
dependabot[bot] 2023-04-30 15:45:02 +09:00 committed by GitHub
parent 819daeb651
commit fa14976a5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/lib/connection_pool/shared_connection_pool.rb
View file

@ -37,7 +37,17 @@ class ConnectionPool::SharedConnectionPool < ConnectionPool
end end
def checkin(preferred_tag) def checkin(preferred_tag)
if ::Thread.current[key(preferred_tag)] if preferred_tag.is_a?(Hash) && preferred_tag[:force]
# ConnectionPool 2.4+ calls `checkin(force: true)` after fork.
# When this happens, we should remove all connections from Thread.current
::Thread.current.keys.each do |name| # rubocop:disable Style/HashEachMethods
next unless name.to_s.start_with?("#{@key}-")
@available.push(::Thread.current[name])
::Thread.current[name] = nil
end
elsif ::Thread.current[key(preferred_tag)]
if ::Thread.current[key_count(preferred_tag)] == 1 if ::Thread.current[key_count(preferred_tag)] == 1
@available.push(::Thread.current[key(preferred_tag)]) @available.push(::Thread.current[key(preferred_tag)])
::Thread.current[key(preferred_tag)] = nil ::Thread.current[key(preferred_tag)] = nil