From d08e006395f137487d017e6a9671df7d99e6a212 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 22 Dec 2021 23:30:00 -0700
Subject: [PATCH] Add support for changing the Redis database
---
CHANGELOG.md | 4 +++-
common/config/models_main.go | 3 ++-
config.sample.yaml | 3 +++
redis_cache/redis.go | 3 ++-
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a931fb1..b7c05a8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## [Unreleased]
-*Nothing yet*.
+### Added
+
+* Added support for setting the Redis database number.
## [1.2.9] - December 22nd, 2021
diff --git a/common/config/models_main.go b/common/config/models_main.go
index 02bc8ab7..6b15b783 100644
--- a/common/config/models_main.go
+++ b/common/config/models_main.go
@@ -92,9 +92,10 @@ type SentryConfig struct {
type RedisConfig struct {
Enabled bool `yaml:"enabled"`
Shards []RedisShardConfig `yaml:"shards,flow"`
+ DbNum int `default:"0" yaml:"databaseNumber"`
}
type RedisShardConfig struct {
Name string `yaml:"name"`
Address string `yaml:"addr"`
-}
\ No newline at end of file
+}
diff --git a/config.sample.yaml b/config.sample.yaml
index e2aca618..b137e81c 100644
--- a/config.sample.yaml
+++ b/config.sample.yaml
@@ -586,6 +586,9 @@ featureSupport:
# Whether or not use Redis instead of in-process caching.
enabled: false
+ # The database number to use. Leave at zero if using a dedicated Redis instance.
+ databaseNumber: 0
+
# The Redis shards that should be used by the media repo in the ring. The names of the
# shards are for your reference and have no bearing on the connection, but must be unique.
shards:
diff --git a/redis_cache/redis.go b/redis_cache/redis.go
index 76b04c78..757c26b8 100644
--- a/redis_cache/redis.go
+++ b/redis_cache/redis.go
@@ -27,8 +27,9 @@ func NewCache() *RedisCache {
addresses[c.Name] = c.Address
}
ring := redis.NewRing(&redis.RingOptions{
- Addrs: addresses,
+ Addrs: addresses,
DialTimeout: 10 * time.Second,
+ DB: config.Get().Features.Redis.DbNum,
})
logrus.Info("Contacting Redis shards...")
--
GitLab