Skip to content

Support SMTP connection pooling

Heinrich Lee Yu requested to merge 230717-actionmailer-smtp-connection-pool into master

What does this MR do?

Adds a new ActionMailer delivery method that supports smtp connection pooling

Testing locally

Add a config/initializers/smtp_settings.rb file with the following contents:

ActionMailer::Base.add_delivery_method :smtp_pool, Gitlab::SMTPPool::DeliveryMethod

Rails.application.config.action_mailer.delivery_method = :smtp_pool
Rails.application.config.action_mailer.perform_deliveries = true

ActionMailer::Base.delivery_method = :smtp_pool
ActionMailer::Base.smtp_pool_settings = {
  ...
  # accepts the same options with :smtp delivery method
}

I also had to set config.eager_load = true in development mode because I was getting autoload deadlocks when multiple notifications were triggered and multiple threads are trying to autoload at the same time.

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team

Related to #230717 (closed)

Edited by Heinrich Lee Yu

Merge request reports

Loading