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/queue/setting.go | |
| 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/queue/setting.go')
| -rw-r--r-- | modules/queue/setting.go | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/modules/queue/setting.go b/modules/queue/setting.go index 35c33aeac2..9ee1af8c7d 100644 --- a/modules/queue/setting.go +++ b/modules/queue/setting.go @@ -27,27 +27,10 @@ func validType(t string) (Type, error) { func getQueueSettings(name string) (setting.QueueSettings, []byte) { q := setting.GetQueueSettings(name) - opts := make(map[string]interface{}) - opts["Name"] = name - opts["QueueLength"] = q.Length - opts["BatchLength"] = q.BatchLength - opts["DataDir"] = q.DataDir - opts["Addresses"] = q.Addresses - opts["Network"] = q.Network - opts["Password"] = q.Password - opts["DBIndex"] = q.DBIndex - opts["QueueName"] = q.QueueName - opts["SetName"] = q.SetName - opts["Workers"] = q.Workers - opts["MaxWorkers"] = q.MaxWorkers - opts["BlockTimeout"] = q.BlockTimeout - opts["BoostTimeout"] = q.BoostTimeout - opts["BoostWorkers"] = q.BoostWorkers - opts["ConnectionString"] = q.ConnectionString - cfg, err := json.Marshal(opts) + cfg, err := json.Marshal(q) if err != nil { - log.Error("Unable to marshall generic options: %v Error: %v", opts, err) + log.Error("Unable to marshall generic options: %v Error: %v", q, err) log.Error("Unable to create queue for %s", name, err) return q, []byte{} } @@ -75,7 +58,7 @@ func CreateQueue(name string, handle HandlerFunc, exemplar interface{}) Queue { Timeout: q.Timeout, MaxAttempts: q.MaxAttempts, Config: cfg, - QueueLength: q.Length, + QueueLength: q.QueueLength, Name: name, }, exemplar) } @@ -114,7 +97,7 @@ func CreateUniqueQueue(name string, handle HandlerFunc, exemplar interface{}) Un Timeout: q.Timeout, MaxAttempts: q.MaxAttempts, Config: cfg, - QueueLength: q.Length, + QueueLength: q.QueueLength, }, exemplar) } if err != nil { |