Avoid setitng the CONN_STR in queues unless it is meant to be set (#13025)

Since the move to common leveldb and common redis the disk queue code
will check the connection string before defaulting to the DATADIR.

Therefore we should ensure that the connection string is kept empty
unless it is actually set.

Fix #13023

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath authored and GitHub committed 2020-10-04 18:12:26 +01:00
1 parent 72636fd664
commit 3f3a4f5b41
2 files changed
+3 -3

No files matched your search

+1 -2
View File
@@ -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)