mirror/whippy-edition
1
0
Fork 0
mirror of https://github.com/whippyshou/mastodon synced 2024-11-29 07:18:48 +09:00
Code

Fix crash in tootctl commands making use of parallelization when Elasticsearch is enabled (#24182)

Browse Source
This commit is contained in:
Claire 2023-03-20 20:02:58 +01:00 committed by GitHub
parent 0ca54a4105
commit bdeb6ff180
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mastodon/cli_helper.rb
View File

@ -52,6 +52,7 @@ module Mastodon
progress.log("Processing #{item.id}") if options[:verbose] progress.log("Processing #{item.id}") if options[:verbose]
Chewy.strategy(:mastodon) do
result = ActiveRecord::Base.connection_pool.with_connection do result = ActiveRecord::Base.connection_pool.with_connection do
yield(item) yield(item)
ensure ensure
@ -60,6 +61,7 @@ module Mastodon
end end
aggregate.increment(result) if result.is_a?(Integer) aggregate.increment(result) if result.is_a?(Integer)
end
rescue => e rescue => e
progress.log pastel.red("Error processing #{item.id}: #{e}") progress.log pastel.red("Error processing #{item.id}: #{e}")
ensure ensure