Merge branch 'main' into glitch-soc/merge-upstream

2021-04-05 14:31:07 +02:00
parent 39b9a0619a 117f6638d0
commit c901ae77d4
21 changed files with 191 additions and 47 deletions
--- a/lib/mastodon/cli_helper.rb
+++ b/lib/mastodon/cli_helper.rb
@ -25,7 +25,9 @@ module Mastodon
        exit(1)
      end

-      ActiveRecord::Base.configurations[Rails.env]['pool'] = options[:concurrency] + 1
+      db_config = ActiveRecord::Base.configurations[Rails.env].dup
+      db_config['pool'] = options[:concurrency] + 1
+      ActiveRecord::Base.establish_connection(db_config)

      progress  = create_progress_bar(scope.count)
      pool      = Concurrent::FixedThreadPool.new(options[:concurrency])