From 6c9b4f6b7710cbbdafcceafb59dfef0be6baba65 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 7 Oct 2019 05:05:02 +0200
Subject: [PATCH] Fix tootctl not allocating enough database connections for
main thread (#12097)
---
lib/mastodon/cli_helper.rb | 2 +-
lib/mastodon/feeds_cli.rb | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/mastodon/cli_helper.rb b/lib/mastodon/cli_helper.rb
index c2950dffa3..ec4d9a81e5 100644
--- a/lib/mastodon/cli_helper.rb
+++ b/lib/mastodon/cli_helper.rb
@@ -20,7 +20,7 @@ module Mastodon
exit(1)
end
- ActiveRecord::Base.configurations[Rails.env]['pool'] = options[:concurrency]
+ ActiveRecord::Base.configurations[Rails.env]['pool'] = options[:concurrency] + 1
progress = create_progress_bar(scope.count)
pool = Concurrent::FixedThreadPool.new(options[:concurrency])
diff --git a/lib/mastodon/feeds_cli.rb b/lib/mastodon/feeds_cli.rb
index ea7c90dffc..578ea15c58 100644
--- a/lib/mastodon/feeds_cli.rb
+++ b/lib/mastodon/feeds_cli.rb
@@ -27,7 +27,6 @@ module Mastodon
dry_run = options[:dry_run] ? '(DRY RUN)' : ''
if options[:all] || username.nil?
-
processed, = parallelize_with_progress(Account.joins(:user).merge(User.active)) do |account|
PrecomputeFeedService.new.call(account) unless options[:dry_run]
end