gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge commit '77bd32a26a' into kb_migration

Browse source
This commit is contained in:
KMY 2023-04-04 17:05:39 +09:00
commit a726b49476
150 changed files with 3189 additions and 1874 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/chewy/strategy/bypass_with_warning.rb Normal file
View file

@ -0,0 +1,12 @@
# frozen_string_literal: true
module Chewy
class Strategy
class BypassWithWarning < Base
def update(...)
Rails.logger.warn 'Chewy update without a root strategy' unless @warning_issued
@warning_issued = true
end
end
end
end

2
lib/mastodon/redis_config.rb
View file

@ -35,7 +35,7 @@ REDIS_CACHE_PARAMS = {
url: ENV['CACHE_REDIS_URL'],
expires_in: 10.minutes,
namespace: cache_namespace,
pool_size: Sidekiq.server? ? Sidekiq.options[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
pool_size: Sidekiq.server? ? Sidekiq[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
pool_timeout: 5,
connect_timeout: 5,
}.freeze