diff options
| author | zeripath <art27@cantab.net> | 2020-10-15 22:40:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-15 17:40:03 -0400 |
| commit | c8f7a6b7742cf42057b6d220ef93ff7f939bb94f (patch) | |
| tree | a84d4a1758c70d297ae4576d1cd6750a5ac59e89 /modules/setting | |
| parent | e374bb7e2dede03eeacaec376c8fbb3c05d07a25 (diff) | |
| download | gitea-c8f7a6b7742cf42057b6d220ef93ff7f939bb94f.tar.gz gitea-c8f7a6b7742cf42057b6d220ef93ff7f939bb94f.zip | |
Slightly simplify the queue settings code to help reduce the risk of problems (#12976)
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'modules/setting')
| -rw-r--r-- | modules/setting/queue.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/modules/setting/queue.go b/modules/setting/queue.go index fc43978610..2365604562 100644 --- a/modules/setting/queue.go +++ b/modules/setting/queue.go @@ -16,8 +16,9 @@ import ( // QueueSettings represent the settings for a queue from the ini type QueueSettings struct { + Name string DataDir string - Length int + QueueLength int `ini:"LENGTH"` BatchLength int ConnectionString string Type string @@ -44,6 +45,8 @@ var Queue = QueueSettings{} func GetQueueSettings(name string) QueueSettings { q := QueueSettings{} sec := Cfg.Section("queue." + name) + q.Name = name + // DataDir is not directly inheritable q.DataDir = filepath.Join(Queue.DataDir, name) // QueueName is not directly inheritable either @@ -65,8 +68,9 @@ func GetQueueSettings(name string) QueueSettings { q.DataDir = filepath.Join(AppDataPath, q.DataDir) } _, _ = sec.NewKey("DATADIR", q.DataDir) + // The rest are... - q.Length = sec.Key("LENGTH").MustInt(Queue.Length) + q.QueueLength = sec.Key("LENGTH").MustInt(Queue.QueueLength) q.BatchLength = sec.Key("BATCH_LENGTH").MustInt(Queue.BatchLength) q.ConnectionString = sec.Key("CONN_STR").MustString(Queue.ConnectionString) q.Type = sec.Key("TYPE").MustString(Queue.Type) @@ -91,7 +95,7 @@ func NewQueueService() { if !filepath.IsAbs(Queue.DataDir) { Queue.DataDir = filepath.Join(AppDataPath, Queue.DataDir) } - Queue.Length = sec.Key("LENGTH").MustInt(20) + Queue.QueueLength = sec.Key("LENGTH").MustInt(20) Queue.BatchLength = sec.Key("BATCH_LENGTH").MustInt(20) Queue.ConnectionString = sec.Key("CONN_STR").MustString("") Queue.Type = sec.Key("TYPE").MustString("persistable-channel") |