potsda.mn/mastodon
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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
parent ab85f59c30
commit 3c82c4e780
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

@ -53,6 +53,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
@ -61,6 +62,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