mirror of
https://github.com/go-gitea/gitea.git
synced 2026-07-25 07:45:17 +02:00
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>
124 lines
3.9 KiB
Go
124 lines
3.9 KiB
Go
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package setting
|
|
|
|
import (
|
|
"path/filepath"
|
|
"runtime"
|
|
|
|
"gitea.dev/modules/json"
|
|
"gitea.dev/modules/log"
|
|
"gitea.dev/modules/util"
|
|
)
|
|
|
|
// QueueSettings represent the settings for a queue from the ini
|
|
type QueueSettings struct {
|
|
Name string // not an INI option, it is the name for [queue.the-name] section
|
|
|
|
Type string
|
|
Datadir string
|
|
ConnStr string // for leveldb or redis
|
|
Length int // max queue length before blocking
|
|
|
|
QueueName, SetName string // the name suffix for storage (db key, redis key), "set" is for unique queue
|
|
|
|
BatchLength int
|
|
MaxWorkers int
|
|
}
|
|
|
|
func GetQueueSettings(rootCfg ConfigProvider, name string) (QueueSettings, error) {
|
|
queueSettingsDefault := QueueSettings{
|
|
Type: "level", // dummy, channel, level, redis
|
|
Datadir: "queues/common", // relative to AppDataPath
|
|
Length: 100000, // queue length before a channel queue will block
|
|
|
|
QueueName: "_queue",
|
|
SetName: "_unique",
|
|
BatchLength: 20,
|
|
MaxWorkers: runtime.NumCPU() / 2,
|
|
}
|
|
if queueSettingsDefault.MaxWorkers < 1 {
|
|
queueSettingsDefault.MaxWorkers = 1
|
|
}
|
|
if queueSettingsDefault.MaxWorkers > 10 {
|
|
queueSettingsDefault.MaxWorkers = 10
|
|
}
|
|
|
|
// deep copy default settings
|
|
cfg := QueueSettings{}
|
|
if cfgBs, err := json.Marshal(queueSettingsDefault); err != nil {
|
|
return cfg, err
|
|
} else if err = json.Unmarshal(cfgBs, &cfg); err != nil {
|
|
return cfg, err
|
|
}
|
|
|
|
cfg.Name = name
|
|
if sec, err := rootCfg.GetSection("queue"); err == nil {
|
|
if err = sec.MapTo(&cfg); err != nil {
|
|
log.Error("Failed to map queue common config for %q: %v", name, err)
|
|
return cfg, nil
|
|
}
|
|
}
|
|
if sec, err := rootCfg.GetSection("queue." + name); err == nil {
|
|
if err = sec.MapTo(&cfg); err != nil {
|
|
log.Error("Failed to map queue spec config for %q: %v", name, err)
|
|
return cfg, nil
|
|
}
|
|
if sec.HasKey("CONN_STR") {
|
|
cfg.ConnStr = sec.Key("CONN_STR").String()
|
|
}
|
|
}
|
|
|
|
if cfg.Datadir == "" {
|
|
cfg.Datadir = queueSettingsDefault.Datadir
|
|
}
|
|
if !filepath.IsAbs(cfg.Datadir) {
|
|
cfg.Datadir = filepath.Join(AppDataPath, cfg.Datadir)
|
|
}
|
|
cfg.Datadir = filepath.ToSlash(cfg.Datadir)
|
|
|
|
// redis fallback order: [queue]/[queue.name] CONN_STR (already merged above) wins,
|
|
// then the shared [redis] conn, then the built-in localhost default for compatibility
|
|
if cfg.Type == "redis" && cfg.ConnStr == "" {
|
|
cfg.ConnStr = util.IfZero(Redis.ConnStr, "redis://127.0.0.1:6379/0")
|
|
}
|
|
|
|
if cfg.Length <= 0 {
|
|
cfg.Length = queueSettingsDefault.Length
|
|
}
|
|
if cfg.MaxWorkers <= 0 {
|
|
cfg.MaxWorkers = queueSettingsDefault.MaxWorkers
|
|
}
|
|
if cfg.BatchLength <= 0 {
|
|
cfg.BatchLength = queueSettingsDefault.BatchLength
|
|
}
|
|
|
|
return cfg, nil
|
|
}
|
|
|
|
func LoadQueueSettings() {
|
|
loadQueueFrom(CfgProvider)
|
|
}
|
|
|
|
func loadQueueFrom(rootCfg ConfigProvider) {
|
|
hasOld := false
|
|
handleOldLengthConfiguration := func(rootCfg ConfigProvider, newQueueName, oldSection, oldKey string) {
|
|
if rootCfg.Section(oldSection).HasKey(oldKey) {
|
|
hasOld = true
|
|
log.Error("Removed queue option: `[%s].%s`. Use new options in `[queue.%s]`", oldSection, oldKey, newQueueName)
|
|
}
|
|
}
|
|
handleOldLengthConfiguration(rootCfg, "issue_indexer", "indexer", "ISSUE_INDEXER_QUEUE_TYPE")
|
|
handleOldLengthConfiguration(rootCfg, "issue_indexer", "indexer", "ISSUE_INDEXER_QUEUE_BATCH_NUMBER")
|
|
handleOldLengthConfiguration(rootCfg, "issue_indexer", "indexer", "ISSUE_INDEXER_QUEUE_DIR")
|
|
handleOldLengthConfiguration(rootCfg, "issue_indexer", "indexer", "ISSUE_INDEXER_QUEUE_CONN_STR")
|
|
handleOldLengthConfiguration(rootCfg, "issue_indexer", "indexer", "UPDATE_BUFFER_LEN")
|
|
handleOldLengthConfiguration(rootCfg, "mailer", "mailer", "SEND_BUFFER_LEN")
|
|
handleOldLengthConfiguration(rootCfg, "pr_patch_checker", "repository", "PULL_REQUEST_QUEUE_LENGTH")
|
|
handleOldLengthConfiguration(rootCfg, "mirror", "repository", "MIRROR_QUEUE_LENGTH")
|
|
if hasOld {
|
|
log.Fatal("Please update your app.ini to remove deprecated config options")
|
|
}
|
|
}
|