Fix tootctl not allocating enough database connections for main thread (#12097)

diff --git a/lib/mastodon/cli_helper.rb b/lib/mastodon/cli_helper.rb
index c2950dffa3865c5194a3512ba5991eb5054d9c37..ec4d9a81e5f2a0cc06ec578ac411d6aa557a807c 100644 (file)
--- 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 ea7c90dffc155dbf5ca2742888caabf3a9a2a4f0..578ea15c587238d440e479fe044d4522b6d6a99c 100644 (file)
--- 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