tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

Browse Source
This commit is contained in:
Jenkins
2018-04-11 00:50:09 +00:00
parent 67e77f230e d9b62e34da
commit 33c2bbdda7
40 changed files with 488 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/initializers/rack_attack_logging.rb Normal file
View File

@ -0,0 +1,4 @@
ActiveSupport::Notifications.subscribe('rack.attack') do |_name, _start, _finish, _request_id, req|
next unless [:throttle, :blacklist].include? req.env['rack.attack.match_type']
Rails.logger.info("Rate limit hit (#{req.env['rack.attack.match_type']}): #{req.ip} #{req.request_method} #{req.fullpath}")
end

6
config/initializers/sidekiq.rb
View File

@ -1,10 +1,10 @@
# frozen_string_literal: true
namespace = ENV.fetch('REDIS_NAMESPACE') { nil }
namespace = ENV.fetch('REDIS_NAMESPACE') { nil }
redis_params = { url: ENV['REDIS_URL'] }
if namespace
redis_params [:namespace] = namespace
redis_params[:namespace] = namespace
end
Sidekiq.configure_server do |config|
@ -18,3 +18,5 @@ end
Sidekiq.configure_client do |config|
config.redis = redis_params
end
Sidekiq::Logging.logger.level = ::Logger::const_get(ENV.fetch('RAILS_LOG_LEVEL', 'info').upcase.to_s)