DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Revert "Sendinblue email balancing using interceptor"

Browse source 
This reverts commit b2135b6576.
This commit is contained in:
clemkeirua 2019-11-04 15:55:08 +01:00
parent 4bb5d13913
commit c61981e795
6 changed files with 9 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/models/dynamic_smtp_settings_interceptor.rb
View file

@ -1,16 +0,0 @@
class DynamicSmtpSettingsInterceptor
def self.delivering_email(message)
if ENV['SENDINBLUE_BALANCING'] == 'enabled'
if rand(0..99) < ENV['SENDINBLUE_BALANCING_VALUE'].to_i
message.delivery_method.settings = {
user_name: ENV['SENDINBLUE_USER_NAME'],
password: ENV['SENDINBLUE_CLIENT_KEY'],
address: 'smtp-relay.sendinblue.com',
domain: 'smtp-relay.sendinblue.com',
port: '587',
authentication: :cram_md5
}
end
end
end
end

7
config/env.example
View file

@ -46,13 +46,8 @@ SENTRY_DSN_JS=""
MATOMO_ENABLED="disabled" MATOMO_ENABLED="disabled"
MATOMO_ID="73" MATOMO_ID="73"
SENDINBLUE_BALANCING="" SENDINBLUE_ENABLED="disabled"
SENDINBLUE_BALANCING_VALUE=""
SENDINBLUE_ENABLED=""
SENDINBLUE_CLIENT_KEY="" SENDINBLUE_CLIENT_KEY=""
SENDINBLUE_USER_NAME=""
CRISP_ENABLED="disabled" CRISP_ENABLED="disabled"
CRISP_CLIENT_KEY="" CRISP_CLIENT_KEY=""

28
config/environments/development.rb
View file

@ -45,26 +45,14 @@ Rails.application.configure do
config.assets.raise_runtime_errors = true config.assets.raise_runtime_errors = true
# Action Mailer settings # Action Mailer settings
config.action_mailer.delivery_method = :letter_opener_web
if ENV['SENDINBLUE_ENABLED'] == 'enabled' # Configure default root URL for generating URLs to routes
config.action_mailer.delivery_method = :smtp config.action_mailer.default_url_options = {
config.action_mailer.smtp_settings = { host: 'localhost',
user_name: Rails.application.secrets.sendinblue[:username], port: 3000
password: Rails.application.secrets.sendinblue[:client_key], }
address: 'smtp-relay.sendinblue.com', # Configure default root URL for email assets
domain: 'smtp-relay.sendinblue.com', config.action_mailer.asset_host = "http://" + ENV['APP_HOST']
port: '587',
authentication: :cram_md5
}
else
config.action_mailer.delivery_method = :letter_opener_web
config.action_mailer.default_url_options = {
host: 'localhost',
port: 3000
}
config.action_mailer.asset_host = "http://" + ENV['APP_HOST']
end
Rails.application.routes.default_url_options = { Rails.application.routes.default_url_options = {
host: 'localhost', host: 'localhost',

10
config/environments/production.rb
View file

@ -77,16 +77,6 @@ Rails.application.configure do
port: '2525', port: '2525',
authentication: :cram_md5 authentication: :cram_md5
} }
elsif ENV['SENDINBLUE_ENABLED'] == 'enabled'
config.action_mailer.delivery_method = :smtp
config.action_mailer.smtp_settings = {
user_name: Rails.application.secrets.sendinblue[:username],
password: Rails.application.secrets.sendinblue[:client_key],
address: 'smtp-relay.sendinblue.com',
domain: 'smtp-relay.sendinblue.com',
port: '587',
authentication: :cram_md5
}
else else
config.action_mailer.delivery_method = :mailjet config.action_mailer.delivery_method = :mailjet
end end

1
config/initializers/dynamic_smtp_settings_interceptor.rb
View file

@ -1 +0,0 @@
ActionMailer::Base.register_interceptor "DynamicSmtpSettingsInterceptor"

1
config/secrets.yml
View file

@ -54,7 +54,6 @@ defaults: &defaults
webhook_secret: <%= ENV['HELPSCOUT_WEBHOOK_SECRET'] %> webhook_secret: <%= ENV['HELPSCOUT_WEBHOOK_SECRET'] %>
sendinblue: sendinblue:
enabled: <%= ENV['SENDINBLUE_ENABLED'] == 'enabled' %> enabled: <%= ENV['SENDINBLUE_ENABLED'] == 'enabled' %>
username: <%= ENV['SENDINBLUE_USER_NAME'] %>
client_key: <%= ENV['SENDINBLUE_CLIENT_KEY'] %> client_key: <%= ENV['SENDINBLUE_CLIENT_KEY'] %>
api_v3_key: <%= ENV['SENDINBLUE_API_V3_KEY'] %> api_v3_key: <%= ENV['SENDINBLUE_API_V3_KEY'] %>
matomo: matomo: