@@ -7,6 +7,7 @@ package setting
7
7
import (
8
8
"fmt"
9
9
"path"
10
+ "path/filepath"
10
11
"strconv"
11
12
"strings"
12
13
"time"
@@ -44,7 +45,7 @@ func GetQueueSettings(name string) QueueSettings {
44
45
q := QueueSettings {}
45
46
sec := Cfg .Section ("queue." + name )
46
47
// DataDir is not directly inheritable
47
- q .DataDir = path .Join (Queue .DataDir , name )
48
+ q .DataDir = filepath .Join (Queue .DataDir , name )
48
49
// QueueName is not directly inheritable either
49
50
q .QueueName = name + Queue .QueueName
50
51
for _ , key := range sec .Keys () {
@@ -55,8 +56,8 @@ func GetQueueSettings(name string) QueueSettings {
55
56
q .QueueName = key .MustString (q .QueueName )
56
57
}
57
58
}
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 )
60
61
}
61
62
sec .Key ("DATADIR" ).SetValue (q .DataDir )
62
63
// The rest are...
@@ -82,8 +83,8 @@ func GetQueueSettings(name string) QueueSettings {
82
83
func NewQueueService () {
83
84
sec := Cfg .Section ("queue" )
84
85
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 )
87
88
}
88
89
Queue .Length = sec .Key ("LENGTH" ).MustInt (20 )
89
90
Queue .BatchLength = sec .Key ("BATCH_LENGTH" ).MustInt (20 )
0 commit comments