diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-10-07 05:05:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-07 05:05:02 +0200 |
commit | 6c9b4f6b7710cbbdafcceafb59dfef0be6baba65 (patch) | |
tree | 88e324fcccd53e675f67810048757c0cc8cefffc /lib | |
parent | 0336621c8026dcbe0d9d19358673cc175a18e613 (diff) |
Fix tootctl not allocating enough database connections for main thread (#12097)
Diffstat (limited to 'lib')
-rw-r--r-- | lib/mastodon/cli_helper.rb | 2 | ||||
-rw-r--r-- | lib/mastodon/feeds_cli.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/mastodon/cli_helper.rb b/lib/mastodon/cli_helper.rb index c2950dffa..ec4d9a81e 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 ea7c90dff..578ea15c5 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 |