diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-05-01 16:52:27 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-05-01 16:52:27 +0200 |
commit | 392ca0472a50ea930f46e22dccf5ce55b04ef588 (patch) | |
tree | 9f8c6b3dcb11a620a417205f9554e8d37e5f3e12 /app/lib/redis_configuration.rb | |
parent | 252deefe3433d0cedafd973becd0d85b5182eb49 (diff) | |
parent | 33f3818d660c67194f94c7ff2bb180f4865e6748 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes.
Diffstat (limited to 'app/lib/redis_configuration.rb')
-rw-r--r-- | app/lib/redis_configuration.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/lib/redis_configuration.rb b/app/lib/redis_configuration.rb index fc8cf2f80..e14d6c8b6 100644 --- a/app/lib/redis_configuration.rb +++ b/app/lib/redis_configuration.rb @@ -2,12 +2,17 @@ class RedisConfiguration class << self + def establish_pool(new_pool_size) + @pool&.shutdown(&:close) + @pool = ConnectionPool.new(size: new_pool_size) { new.connection } + end + def with pool.with { |redis| yield redis } end def pool - @pool ||= ConnectionPool.new(size: pool_size) { new.connection } + @pool ||= establish_pool(pool_size) end def pool_size |