|
8 | 8 | params: event.payload[:params].except('controller', 'action', 'format', 'utf8'),
|
9 | 9 | user_id: event.payload[:user_id],
|
10 | 10 | organization_id: event.payload[:organization_id],
|
11 |
| - referer: event.payload[:referer], |
| 11 | + referer: event.payload[:referer] |
12 | 12 | }
|
13 | 13 | end
|
14 | 14 | # Settings specified here will take precedence over those in config/application.rb.
|
|
55 | 55 | config.log_level = :info
|
56 | 56 |
|
57 | 57 | # Prepend all log lines with the following tags.
|
58 |
| - config.log_tags = [ :request_id ] |
| 58 | + config.log_tags = [:request_id] |
59 | 59 |
|
60 | 60 | # Use a different cache store in production.
|
61 |
| - if ENV["MEMCACHEDCLOUD_SERVERS"].present? |
62 |
| - config.cache_store = :mem_cache_store, ENV["MEMCACHEDCLOUD_SERVERS"].split(","), { |
63 |
| - username: ENV["MEMCACHEDCLOUD_USERNAME"], password: ENV["MEMCACHEDCLOUD_PASSWORD"] |
64 |
| - } |
65 |
| - end |
| 61 | + config.cache_store = :redis_cache_store, { url: ENV.fetch('REDIS_STORE_URL', 'redis://localhost:6379') } |
66 | 62 |
|
67 | 63 | # Use a real queuing backend for Active Job (and separate queues per environment)
|
68 |
| - config.active_job.queue_adapter = :sidekiq |
| 64 | + config.active_job.queue_adapter = :sidekiq |
69 | 65 | # config.active_job.queue_name_prefix = "metadecidim_#{Rails.env}"
|
70 | 66 | config.action_mailer.perform_caching = false
|
71 | 67 |
|
|
83 | 79 | # Use default logging formatter so that PID and timestamp are not suppressed.
|
84 | 80 | config.log_formatter = ::Logger::Formatter.new
|
85 | 81 | config.action_mailer.smtp_settings = {
|
86 |
| - :address => Rails.application.secrets.smtp_address, |
87 |
| - :port => Rails.application.secrets.smtp_port, |
88 |
| - :authentication => Rails.application.secrets.smtp_authentication, |
89 |
| - :user_name => Rails.application.secrets.smtp_username, |
90 |
| - :password => Rails.application.secrets.smtp_password, |
91 |
| - :domain => Rails.application.secrets.smtp_domain, |
92 |
| - :enable_starttls_auto => Rails.application.secrets.smtp_starttls_auto, |
93 |
| - :openssl_verify_mode => 'none' |
| 82 | + address: Rails.application.secrets.smtp_address, |
| 83 | + port: Rails.application.secrets.smtp_port, |
| 84 | + authentication: Rails.application.secrets.smtp_authentication, |
| 85 | + user_name: Rails.application.secrets.smtp_username, |
| 86 | + password: Rails.application.secrets.smtp_password, |
| 87 | + domain: Rails.application.secrets.smtp_domain, |
| 88 | + enable_starttls_auto: Rails.application.secrets.smtp_starttls_auto, |
| 89 | + openssl_verify_mode: 'none' |
94 | 90 | }
|
95 | 91 |
|
96 | 92 | if Rails.application.secrets.sendgrid
|
97 | 93 | config.action_mailer.default_options = {
|
98 |
| - "X-SMTPAPI" => { |
99 |
| - filters: { |
| 94 | + 'X-SMTPAPI' => { |
| 95 | + filters: { |
100 | 96 | clicktrack: { settings: { enable: 0 } },
|
101 |
| - opentrack: { settings: { enable: 0 } } |
| 97 | + opentrack: { settings: { enable: 0 } } |
102 | 98 | }
|
103 | 99 | }.to_json
|
104 | 100 | }
|
105 | 101 | end
|
106 | 102 |
|
107 |
| - |
108 | 103 | # Use a different logger for distributed setups.
|
109 | 104 | # require 'syslog/logger'
|
110 | 105 | # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
|
111 | 106 |
|
112 |
| - if ENV["RAILS_LOG_TO_STDOUT"].present? |
| 107 | + if ENV['RAILS_LOG_TO_STDOUT'].present? |
113 | 108 | logger = ActiveSupport::Logger.new(STDOUT)
|
114 | 109 | logger.formatter = config.log_formatter
|
115 | 110 | config.logger = ActiveSupport::TaggedLogging.new(logger)
|
|
0 commit comments