diff options
Diffstat (limited to 'lib/gitlab/redis/multi_store.rb')
| -rw-r--r-- | lib/gitlab/redis/multi_store.rb | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/lib/gitlab/redis/multi_store.rb b/lib/gitlab/redis/multi_store.rb index 7f4d611a490..9ce030c0bbe 100644 --- a/lib/gitlab/redis/multi_store.rb +++ b/lib/gitlab/redis/multi_store.rb @@ -19,8 +19,12 @@ module Gitlab end class MethodMissingError < StandardError + def initialize(cmd) + @cmd = cmd + end + def message - 'Method missing. Falling back to execute method on the redis default store in Rails.env.production.' + "Method missing #{@cmd}. Falling back to execute method on the redis default store in Rails.env.production." end end @@ -38,6 +42,17 @@ module Gitlab SKIP_LOG_METHOD_MISSING_FOR_COMMANDS = %i[info].freeze + # _client and without_reconnect are Redis::Client methods which may be called through multistore + REDIS_CLIENT_COMMANDS = %i[ + _client + without_reconnect + ].freeze + + PUBSUB_SUBSCRIBE_COMMANDS = %i[ + subscribe + unsubscribe + ].freeze + READ_COMMANDS = %i[ exists exists? @@ -71,6 +86,7 @@ module Gitlab incr incrby mapped_hmset + publish rpush sadd sadd? @@ -126,7 +142,7 @@ module Gitlab end # rubocop:disable GitlabSecurity/PublicSend - READ_COMMANDS.each do |name| + (READ_COMMANDS + REDIS_CLIENT_COMMANDS + PUBSUB_SUBSCRIBE_COMMANDS).each do |name| define_method(name) do |*args, **kwargs, &block| if use_primary_and_secondary_stores? read_command(name, *args, **kwargs, &block) @@ -246,9 +262,9 @@ module Gitlab def log_method_missing(command_name, *_args) return if SKIP_LOG_METHOD_MISSING_FOR_COMMANDS.include?(command_name) - raise MethodMissingError if Rails.env.test? || Rails.env.development? + raise MethodMissingError, command_name if Rails.env.test? || Rails.env.development? - log_error(MethodMissingError.new, command_name) + log_error(MethodMissingError.new(command_name), command_name) increment_method_missing_count(command_name) end |