diff options
| author | Starfall <us@starfall.systems> | 2022-11-28 16:41:29 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-11-28 16:41:29 -0600 |
| commit | cb9dad90b01c9f53d1910cf128eb22200bdb9884 (patch) | |
| tree | 1935d74f49853ed371e36cfac2d44ac33d2e8a2e /lib | |
| parent | c3c3b6953f37462f26f011b6c6cbd1655d5dcbea (diff) | |
| parent | 1a7aa37b60769a10077c585fa76ec848b6866d9a (diff) | |
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/enumerable.rb | 26 | ||||
| -rw-r--r-- | lib/mastodon/redis_config.rb | 1 | ||||
| -rw-r--r-- | lib/mastodon/version.rb | 2 |
3 files changed, 2 insertions, 27 deletions
diff --git a/lib/enumerable.rb b/lib/enumerable.rb deleted file mode 100644 index 66918f65e..000000000 --- a/lib/enumerable.rb +++ /dev/null @@ -1,26 +0,0 @@ -# frozen_string_literal: true - -module Enumerable - # TODO: Remove this once stop to support Ruby 2.6 - if RUBY_VERSION < '2.7.0' - def filter_map - if block_given? - result = [] - each do |element| - res = yield element - result << res if res - end - result - else - Enumerator.new do |yielder| - result = [] - each do |element| - res = yielder.yield element - result << res if res - end - result - end - end - end - end -end diff --git a/lib/mastodon/redis_config.rb b/lib/mastodon/redis_config.rb index 98dc4788d..3522fa11e 100644 --- a/lib/mastodon/redis_config.rb +++ b/lib/mastodon/redis_config.rb @@ -37,6 +37,7 @@ REDIS_CACHE_PARAMS = { namespace: cache_namespace, pool_size: Sidekiq.server? ? Sidekiq.options[:concurrency] : Integer(ENV['MAX_THREADS'] || 5), pool_timeout: 5, + connect_timeout: 5, }.freeze REDIS_SIDEKIQ_PARAMS = { diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index f37553709..3340d0bf5 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -13,7 +13,7 @@ module Mastodon end def patch - 1 + 2 end def flags |