mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-22 12:35:07 +01:00
43eff898a0
* Fix misuse of foreign_type * Fix use of removed "add_template_helper" * Use response.media_type instead of response.content_type in tests * Fix CSV export controller test on Rails 6 Rails 6 sets a "filename*" field in the Content-Disposition header to explicitly encode the filename as UTF-8. This changes checks the first part of the Content-Disposition header so it matches in both Rails 5 and Rails 6. * Fix emoji formatting with Rails 6 * Make emoji output more idiomatic and robust * Switch from redis-rails gem to built-in Rails redis cache storage
44 lines
1.0 KiB
Ruby
44 lines
1.0 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
namespace = ENV.fetch('REDIS_NAMESPACE') { nil }
|
|
redis_params = { url: ENV['REDIS_URL'], driver: :hiredis }
|
|
|
|
if namespace
|
|
redis_params[:namespace] = namespace
|
|
end
|
|
|
|
Sidekiq.configure_server do |config|
|
|
config.redis = redis_params
|
|
|
|
config.server_middleware do |chain|
|
|
chain.add SidekiqErrorHandler
|
|
end
|
|
|
|
config.server_middleware do |chain|
|
|
chain.add SidekiqUniqueJobs::Middleware::Server
|
|
end
|
|
|
|
config.client_middleware do |chain|
|
|
chain.add SidekiqUniqueJobs::Middleware::Client
|
|
end
|
|
|
|
SidekiqUniqueJobs::Server.configure(config)
|
|
end
|
|
|
|
Sidekiq.configure_client do |config|
|
|
config.redis = redis_params
|
|
|
|
config.client_middleware do |chain|
|
|
chain.add SidekiqUniqueJobs::Middleware::Client
|
|
end
|
|
end
|
|
|
|
Sidekiq.logger.level = ::Logger.const_get(ENV.fetch('RAILS_LOG_LEVEL', 'info').upcase.to_s)
|
|
|
|
SidekiqUniqueJobs.configure do |config|
|
|
config.reaper = :ruby
|
|
config.reaper_count = 1000
|
|
config.reaper_interval = 600
|
|
config.reaper_timeout = 150
|
|
end
|