diff --git a/Gemfile b/Gemfile index d523170a4ed..8f032801eba 100644 --- a/Gemfile +++ b/Gemfile @@ -36,14 +36,7 @@ gem 'mail', require: false gem 'mini_mime' gem 'mini_suffix' -# holding off redis upgrade temporarily as it is having issues with our current -# freedom patch, we will follow this up. -# -# FrozenError: can't modify frozen Hash -# /var/www/discourse/vendor/bundle/ruby/2.5.0/gems/redis-4.1.0/lib/redis/client.rb:93:in `delete' -# /var/www/discourse/vendor/bundle/ruby/2.5.0/gems/redis-4.1.0/lib/redis/client.rb:93:in `initialize' -# /var/www/discourse/lib/freedom_patches/redis.rb:7:in `initialize' -gem 'redis', '4.0.1' +gem 'redis', '4.1.3' gem 'redis-namespace' gem 'active_model_serializers', '~> 0.8.3' diff --git a/Gemfile.lock b/Gemfile.lock index f58c26a167b..b43335ea81f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -182,7 +182,7 @@ GEM mini_mime (>= 0.1.1) maxminddb (0.1.22) memory_profiler (0.9.13) - message_bus (2.2.2) + message_bus (2.2.3) rack (>= 1.1.3) metaclass (0.0.4) method_source (0.9.2) @@ -309,7 +309,7 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rchardet (1.8.0) - redis (4.0.1) + redis (4.1.3) redis-namespace (1.6.0) redis (>= 3.0.4) request_store (1.4.1) @@ -516,7 +516,7 @@ DEPENDENCIES rb-inotify (~> 0.9) rbtrace rchardet - redis (= 4.0.1) + redis (= 4.1.3) redis-namespace rinku rotp diff --git a/config/application.rb b/config/application.rb index dd56bf859fe..a8f2fcc98fa 100644 --- a/config/application.rb +++ b/config/application.rb @@ -241,7 +241,6 @@ module Discourse require 'discourse_redis' require 'logster/redis_store' - require 'freedom_patches/redis' # Use redis for our cache config.cache_store = DiscourseRedis.new_redis_store $redis = DiscourseRedis.new diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb index 89e588806f2..ae2884f933b 100644 --- a/lib/discourse_redis.rb +++ b/lib/discourse_redis.rb @@ -155,7 +155,7 @@ class DiscourseRedis def initialize(config = nil, namespace: true) @config = config || DiscourseRedis.config - @redis = DiscourseRedis.raw_connection(@config) + @redis = DiscourseRedis.raw_connection(@config.dup) @namespace = namespace end diff --git a/lib/freedom_patches/redis.rb b/lib/freedom_patches/redis.rb deleted file mode 100644 index 8945ece473e..00000000000 --- a/lib/freedom_patches/redis.rb +++ /dev/null @@ -1,16 +0,0 @@ -# frozen_string_literal: true - -# https://github.com/redis/redis-rb/pull/591 -class Redis - class Client - alias_method :old_initialize, :initialize - - def initialize(options = {}) - old_initialize(options) - - if options.include?(:connector) && options[:connector].is_a?(Class) - @connector = options[:connector].new(@options) - end - end - end -end