summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules/setting/queue.go3
-rw-r--r--modules/setting/task.go3
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/setting/queue.go b/modules/setting/queue.go
index 8bdca1017f..fc43978610 100644
--- a/modules/setting/queue.go
+++ b/modules/setting/queue.go
@@ -6,7 +6,6 @@ package setting
import (
"fmt"
- "path"
"path/filepath"
"strconv"
"strings"
@@ -94,7 +93,7 @@ func NewQueueService() {
}
Queue.Length = sec.Key("LENGTH").MustInt(20)
Queue.BatchLength = sec.Key("BATCH_LENGTH").MustInt(20)
- Queue.ConnectionString = sec.Key("CONN_STR").MustString(path.Join(AppDataPath, ""))
+ Queue.ConnectionString = sec.Key("CONN_STR").MustString("")
Queue.Type = sec.Key("TYPE").MustString("persistable-channel")
Queue.Network, Queue.Addresses, Queue.Password, Queue.DBIndex, _ = ParseQueueConnStr(Queue.ConnectionString)
Queue.WrapIfNecessary = sec.Key("WRAP_IF_NECESSARY").MustBool(true)
diff --git a/modules/setting/task.go b/modules/setting/task.go
index 81ed39a9fb..d9329dbb76 100644
--- a/modules/setting/task.go
+++ b/modules/setting/task.go
@@ -10,9 +10,10 @@ func newTaskService() {
switch taskSec.Key("QUEUE_TYPE").MustString(ChannelQueueType) {
case ChannelQueueType:
queueTaskSec.Key("TYPE").MustString("persistable-channel")
+ queueTaskSec.Key("CONN_STR").MustString(taskSec.Key("QUEUE_CONN_STR").MustString(""))
case RedisQueueType:
queueTaskSec.Key("TYPE").MustString("redis")
+ queueTaskSec.Key("CONN_STR").MustString(taskSec.Key("QUEUE_CONN_STR").MustString("addrs=127.0.0.1:6379 db=0"))
}
queueTaskSec.Key("LENGTH").MustInt(taskSec.Key("QUEUE_LENGTH").MustInt(1000))
- queueTaskSec.Key("CONN_STR").MustString(taskSec.Key("QUEUE_CONN_STR").MustString("addrs=127.0.0.1:6379 db=0"))
}