MirrorHub/forgejo
0
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-22 12:33:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename QUEUE_NAME REDIS_QUEUE_NAME

Browse source
This commit is contained in:
Andrew Thornton 2020-01-07 09:08:29 +00:00
parent a74b473655
commit 1f83b4fc9b
No known key found for this signature in database
GPG key ID: 3CDE74631F13A748
4 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/content/doc/advanced/config-cheat-sheet.en-us.md
View file

@ -247,7 +247,7 @@ relation to port exhaustion.
- `LENGTH`: **20**: Maximal queue size before channel queues block - `LENGTH`: **20**: Maximal queue size before channel queues block
- `BATCH_LENGTH`: **20**: Batch data before passing to the handler - `BATCH_LENGTH`: **20**: Batch data before passing to the handler
- `CONN_STR`: **addrs=127.0.0.1:6379 db=0**: Connection string for the redis queue type. - `CONN_STR`: **addrs=127.0.0.1:6379 db=0**: Connection string for the redis queue type.
- `QUEUE_NAME`: **_queue**: The suffix for default redis queue name. Individual queues will default to **`name`**`QUEUE_NAME` but can be overriden in the specific `queue.name` section. - `REDIS_QUEUE_NAME`: **_queue**: The suffix for default redis queue name. Individual queues will default to **`name`**`REDIS_QUEUE_NAME` but can be overriden in the specific `queue.name` section.
- `WRAP_IF_NECESSARY`: **true**: Will wrap queues with a timeoutable queue if the selected queue is not ready to be created - (Only relevant for the level queue.) - `WRAP_IF_NECESSARY`: **true**: Will wrap queues with a timeoutable queue if the selected queue is not ready to be created - (Only relevant for the level queue.)
- `MAX_ATTEMPTS`: **10**: Maximum number of attempts to create the wrapped queue - `MAX_ATTEMPTS`: **10**: Maximum number of attempts to create the wrapped queue
- `TIMEOUT`: **GRACEFUL_HAMMER_TIME + 30s**: Timeout the creation of the wrapped queue if it takes longer than this to create. - `TIMEOUT`: **GRACEFUL_HAMMER_TIME + 30s**: Timeout the creation of the wrapped queue if it takes longer than this to create.

28
modules/queue/queue_redis.go
View file

@ -44,19 +44,19 @@ type RedisQueue struct {
// RedisQueueConfiguration is the configuration for the redis queue // RedisQueueConfiguration is the configuration for the redis queue
type RedisQueueConfiguration struct { type RedisQueueConfiguration struct {
Network string Network string
Addresses string Addresses string
Password string Password string
DBIndex int DBIndex int
BatchLength int BatchLength int
QueueLength int QueueLength int
QueueName string RedisQueueName string
Workers int Workers int
MaxWorkers int MaxWorkers int
BlockTimeout time.Duration BlockTimeout time.Duration
BoostTimeout time.Duration BoostTimeout time.Duration
BoostWorkers int BoostWorkers int
Name string Name string
} }
// NewRedisQueue creates single redis or cluster redis queue // NewRedisQueue creates single redis or cluster redis queue
@ -84,7 +84,7 @@ func NewRedisQueue(handle HandlerFunc, cfg, exemplar interface{}) (Queue, error)
boostWorkers: config.BoostWorkers, boostWorkers: config.BoostWorkers,
maxNumberOfWorkers: config.MaxWorkers, maxNumberOfWorkers: config.MaxWorkers,
}, },
queueName: config.QueueName, queueName: config.RedisQueueName,
exemplar: exemplar, exemplar: exemplar,
closed: make(chan struct{}), closed: make(chan struct{}),
workers: config.Workers, workers: config.Workers,

2
modules/queue/setting.go
View file

@ -36,7 +36,7 @@ func CreateQueue(name string, handle HandlerFunc, exemplar interface{}) Queue {
opts["Network"] = q.Network opts["Network"] = q.Network
opts["Password"] = q.Password opts["Password"] = q.Password
opts["DBIndex"] = q.DBIndex opts["DBIndex"] = q.DBIndex
opts["QueueName"] = q.QueueName opts["RedisQueueName"] = q.RedisQueueName
opts["Workers"] = q.Workers opts["Workers"] = q.Workers
opts["MaxWorkers"] = q.MaxWorkers opts["MaxWorkers"] = q.MaxWorkers
opts["BlockTimeout"] = q.BlockTimeout opts["BlockTimeout"] = q.BlockTimeout

12
modules/setting/queue.go
View file

@ -24,7 +24,7 @@ type QueueSettings struct {
Network string Network string
Addresses string Addresses string
Password string Password string
QueueName string RedisQueueName string
DBIndex int DBIndex int
WrapIfNecessary bool WrapIfNecessary bool
MaxAttempts int MaxAttempts int
@ -45,14 +45,14 @@ func GetQueueSettings(name string) QueueSettings {
sec := Cfg.Section("queue." + name) sec := Cfg.Section("queue." + name)
// DataDir is not directly inheritable // DataDir is not directly inheritable
q.DataDir = path.Join(Queue.DataDir, name) q.DataDir = path.Join(Queue.DataDir, name)
// QueueName is not directly inheritable either // RedisQueueName is not directly inheritable either
q.QueueName = name + Queue.QueueName q.RedisQueueName = name + Queue.RedisQueueName
for _, key := range sec.Keys() { for _, key := range sec.Keys() {
switch key.Name() { switch key.Name() {
case "DATADIR": case "DATADIR":
q.DataDir = key.MustString(q.DataDir) q.DataDir = key.MustString(q.DataDir)
case "QUEUE_NAME": case "REDIS_QUEUE_NAME":
q.QueueName = key.MustString(q.QueueName) q.RedisQueueName = key.MustString(q.RedisQueueName)
} }
} }
if !path.IsAbs(q.DataDir) { if !path.IsAbs(q.DataDir) {
@ -98,7 +98,7 @@ func NewQueueService() {
Queue.BlockTimeout = sec.Key("BLOCK_TIMEOUT").MustDuration(1 * time.Second) Queue.BlockTimeout = sec.Key("BLOCK_TIMEOUT").MustDuration(1 * time.Second)
Queue.BoostTimeout = sec.Key("BOOST_TIMEOUT").MustDuration(5 * time.Minute) Queue.BoostTimeout = sec.Key("BOOST_TIMEOUT").MustDuration(5 * time.Minute)
Queue.BoostWorkers = sec.Key("BOOST_WORKERS").MustInt(5) Queue.BoostWorkers = sec.Key("BOOST_WORKERS").MustInt(5)
Queue.QueueName = sec.Key("QUEUE_NAME").MustString("_queue") Queue.RedisQueueName = sec.Key("REDIS_QUEUE_NAME").MustString("_queue")
// Now handle the old issue_indexer configuration // Now handle the old issue_indexer configuration
section := Cfg.Section("queue.issue_indexer") section := Cfg.Section("queue.issue_indexer")