From c1a80b7d6aed36aebcae9b99f63336c758c0e2c4 Mon Sep 17 00:00:00 2001 From: zeripath Date: Wed, 26 May 2021 03:50:35 +0100 Subject: Use filepath.ToSlash and Join in indexer defaults and queues (#15971) As revealed by #15964 there is inconsistent use of filepath Join and path Join for these directories. The best thing to do is to use filepath.Join but then ToSlash them for consistency. Signed-off-by: Andrew Thornton Co-authored-by: John Olheiser --- modules/setting/queue.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/setting/queue.go') diff --git a/modules/setting/queue.go b/modules/setting/queue.go index c626f585f0..41e95fbe5a 100644 --- a/modules/setting/queue.go +++ b/modules/setting/queue.go @@ -48,7 +48,7 @@ func GetQueueSettings(name string) QueueSettings { q.Name = name // DataDir is not directly inheritable - q.DataDir = filepath.Join(Queue.DataDir, "common") + q.DataDir = filepath.ToSlash(filepath.Join(Queue.DataDir, "common")) // QueueName is not directly inheritable either q.QueueName = name + Queue.QueueName for _, key := range sec.Keys() { @@ -91,9 +91,9 @@ func GetQueueSettings(name string) QueueSettings { // This is exported for tests to be able to use the queue func NewQueueService() { sec := Cfg.Section("queue") - Queue.DataDir = sec.Key("DATADIR").MustString("queues/") + Queue.DataDir = filepath.ToSlash(sec.Key("DATADIR").MustString("queues/")) if !filepath.IsAbs(Queue.DataDir) { - Queue.DataDir = filepath.Join(AppDataPath, Queue.DataDir) + Queue.DataDir = filepath.ToSlash(filepath.Join(AppDataPath, Queue.DataDir)) } Queue.QueueLength = sec.Key("LENGTH").MustInt(20) Queue.BatchLength = sec.Key("BATCH_LENGTH").MustInt(20) -- cgit v1.2.3