Skip to content

Commit c779ac1

Browse files
6543sapk
andcommitted
fix #9648 | use filepath.IsAbs instead of path.IsAbs (#9651)
* fix #9648 * found next Co-authored-by: Antoine GIRARD <[email protected]>
1 parent 98772d3 commit c779ac1

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

modules/setting/queue.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package setting
77
import (
88
"fmt"
99
"path"
10+
"path/filepath"
1011
"strconv"
1112
"strings"
1213
"time"
@@ -44,7 +45,7 @@ func GetQueueSettings(name string) QueueSettings {
4445
q := QueueSettings{}
4546
sec := Cfg.Section("queue." + name)
4647
// DataDir is not directly inheritable
47-
q.DataDir = path.Join(Queue.DataDir, name)
48+
q.DataDir = filepath.Join(Queue.DataDir, name)
4849
// QueueName is not directly inheritable either
4950
q.QueueName = name + Queue.QueueName
5051
for _, key := range sec.Keys() {
@@ -55,8 +56,8 @@ func GetQueueSettings(name string) QueueSettings {
5556
q.QueueName = key.MustString(q.QueueName)
5657
}
5758
}
58-
if !path.IsAbs(q.DataDir) {
59-
q.DataDir = path.Join(AppDataPath, q.DataDir)
59+
if !filepath.IsAbs(q.DataDir) {
60+
q.DataDir = filepath.Join(AppDataPath, q.DataDir)
6061
}
6162
sec.Key("DATADIR").SetValue(q.DataDir)
6263
// The rest are...
@@ -82,8 +83,8 @@ func GetQueueSettings(name string) QueueSettings {
8283
func NewQueueService() {
8384
sec := Cfg.Section("queue")
8485
Queue.DataDir = sec.Key("DATADIR").MustString("queues/")
85-
if !path.IsAbs(Queue.DataDir) {
86-
Queue.DataDir = path.Join(AppDataPath, Queue.DataDir)
86+
if !filepath.IsAbs(Queue.DataDir) {
87+
Queue.DataDir = filepath.Join(AppDataPath, Queue.DataDir)
8788
}
8889
Queue.Length = sec.Key("LENGTH").MustInt(20)
8990
Queue.BatchLength = sec.Key("BATCH_LENGTH").MustInt(20)

0 commit comments

Comments
 (0)