mirror of
https://github.com/go-gitea/gitea.git
synced 2026-07-25 18:21:54 +00:00
1e42317b66
Adds a shared `[redis]` config section with a single `CONN_STR` key that acts as the default Redis connection for every redis-backed subsystem whose own connection string is empty: `[cache].HOST`, `[session].PROVIDER_CONFIG`, `[queue].CONN_STR` and `[global_lock].SERVICE_CONN_STR`. Precedence: per-subsystem value > shared `[redis].CONN_STR` > existing built-in defaults. Fully backward compatible: when `[redis]` is not set, every code path behaves exactly as before. Motivation: today an admin with one Redis instance has to repeat the same connection string in up to four places (five once WebSocket lands). Requested by @wxiaoguang in [this review discussion](https://github.com/go-gitea/gitea/pull/36965#discussion_r3613306976) as a prerequisite for #36965. This follows the pattern used by GitLab and Mastodon: one global Redis definition, per-subsystem overrides fall back to it. Since #12385 all identical connection strings already share one client via `nosql.Manager`, so pointing all subsystems at `[redis].CONN_STR` naturally converges onto a single shared connection pool. Covered by table-driven unit tests per subsystem (fallback applies, own value wins, absent `[redis]` = unchanged behavior). A config-cheat-sheet update for gitea/docs will follow once this is merged. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: TheFox0x7 <thefox0x7@gmail.com>
75 lines
1.9 KiB
Go
75 lines
1.9 KiB
Go
// Copyright 2024 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package setting
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"gitea.dev/modules/test"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestLoadGlobalLockConfig(t *testing.T) {
|
|
t.Run("DefaultGlobalLockConfig", func(t *testing.T) {
|
|
defer test.MockVariableValue(&Redis)()
|
|
iniStr := ``
|
|
cfg, err := NewConfigProviderFromData(iniStr)
|
|
assert.NoError(t, err)
|
|
loadRedisFrom(cfg)
|
|
loadGlobalLockFrom(cfg)
|
|
assert.Equal(t, "memory", GlobalLock.ServiceType)
|
|
})
|
|
|
|
t.Run("RedisGlobalLockConfig", func(t *testing.T) {
|
|
defer test.MockVariableValue(&Redis)()
|
|
iniStr := `
|
|
[global_lock]
|
|
SERVICE_TYPE = redis
|
|
SERVICE_CONN_STR = addrs=127.0.0.1:6379 db=0
|
|
`
|
|
cfg, err := NewConfigProviderFromData(iniStr)
|
|
assert.NoError(t, err)
|
|
loadRedisFrom(cfg)
|
|
loadGlobalLockFrom(cfg)
|
|
assert.Equal(t, "redis", GlobalLock.ServiceType)
|
|
assert.Equal(t, "addrs=127.0.0.1:6379 db=0", GlobalLock.ServiceConnStr)
|
|
})
|
|
|
|
t.Run("RedisGlobalLockFallsBackToSharedRedis", func(t *testing.T) {
|
|
defer test.MockVariableValue(&Redis)()
|
|
iniStr := `
|
|
[redis]
|
|
CONN_STR = redis://127.0.0.1:6379/0
|
|
[global_lock]
|
|
SERVICE_TYPE = redis
|
|
`
|
|
cfg, err := NewConfigProviderFromData(iniStr)
|
|
assert.NoError(t, err)
|
|
|
|
loadRedisFrom(cfg)
|
|
loadGlobalLockFrom(cfg)
|
|
assert.Equal(t, "redis", GlobalLock.ServiceType)
|
|
assert.Equal(t, "redis://127.0.0.1:6379/0", GlobalLock.ServiceConnStr)
|
|
})
|
|
|
|
t.Run("RedisGlobalLockOwnConnWinsOverSharedRedis", func(t *testing.T) {
|
|
defer test.MockVariableValue(&Redis)()
|
|
iniStr := `
|
|
[redis]
|
|
CONN_STR = redis://127.0.0.1:6379/0
|
|
[global_lock]
|
|
SERVICE_TYPE = redis
|
|
SERVICE_CONN_STR = redis://10.0.0.1:6379/1
|
|
`
|
|
cfg, err := NewConfigProviderFromData(iniStr)
|
|
assert.NoError(t, err)
|
|
|
|
loadRedisFrom(cfg)
|
|
loadGlobalLockFrom(cfg)
|
|
assert.Equal(t, "redis", GlobalLock.ServiceType)
|
|
assert.Equal(t, "redis://10.0.0.1:6379/1", GlobalLock.ServiceConnStr)
|
|
})
|
|
}
|