astrid
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

pull/12101/head
Eugen Rochko 2019-10-07 05:05:02 +02:00 committed by GitHub
parent 0336621c80
commit 6c9b4f6b77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mastodon/cli_helper.rb
View File

@ -20,7 +20,7 @@ module Mastodon
exit(1) exit(1)
end end
ActiveRecord::Base.configurations[Rails.env]['pool'] = options[:concurrency] ActiveRecord::Base.configurations[Rails.env]['pool'] = options[:concurrency] + 1
progress = create_progress_bar(scope.count) progress = create_progress_bar(scope.count)
pool = Concurrent::FixedThreadPool.new(options[:concurrency]) pool = Concurrent::FixedThreadPool.new(options[:concurrency])

1
lib/mastodon/feeds_cli.rb
View File

@ -27,7 +27,6 @@ module Mastodon
dry_run = options[:dry_run] ? '(DRY RUN)' : '' dry_run = options[:dry_run] ? '(DRY RUN)' : ''
if options[:all] || username.nil? if options[:all] || username.nil?
processed, = parallelize_with_progress(Account.joins(:user).merge(User.active)) do |account| processed, = parallelize_with_progress(Account.joins(:user).merge(User.active)) do |account|
PrecomputeFeedService.new.call(account) unless options[:dry_run] PrecomputeFeedService.new.call(account) unless options[:dry_run]
end end