Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-06-20 16:29:19 +0300
committerRobert Speicher <rspeicher@gmail.com>2016-06-20 17:17:28 +0300
commit85c10d46ddd5ac2c243251553ce81edc90ee8bb4 (patch)
tree01ba29c414e5d094f65dd95682ebfd854de0993e /config
parentdc2670f2d2aaa28d2d9975fb5c6c724b4d1d62c9 (diff)
Merge branch '18810-nameerror-uninitialized-constant-mail-parsers-addressstruct' into 'master'
Avoid autoload issue such as 'Mail::Parsers::AddressStruct' This is mostly a shot in the dark but at least it shouldn't break anything. Fixes #18810. See merge request !4793
Diffstat (limited to 'config')
-rw-r--r--config/initializers/sidekiq.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index f1eec674888..7a2b9a7f6c1 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -23,6 +23,10 @@ Sidekiq.configure_server do |config|
config['pool'] = Sidekiq.options[:concurrency] + 2
ActiveRecord::Base.establish_connection(config)
Rails.logger.debug("Connection Pool size for Sidekiq Server is now: #{ActiveRecord::Base.connection.pool.instance_variable_get('@size')}")
+
+ # Avoid autoload issue such as 'Mail::Parsers::AddressStruct'
+ # https://github.com/mikel/mail/issues/912#issuecomment-214850355
+ Mail.eager_autoload!
end
Sidekiq.configure_client do |config|