Skip to content

Commit

Permalink
Avoid setting the CONN_STR in issue indexer queue unless it is meant …
Browse files Browse the repository at this point in the history
…to be set

Since the move to common leveldb and common redis the disk queue code (go-gitea#12385)
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.

Unforunately the issue indexer was missed in go-gitea#13025 this PR fixes this omission

Fix go-gitea#13062

Signed-off-by: Andrew Thornton <art27@cantab.net>
  • Loading branch information
zeripath committed Oct 7, 2020
1 parent 1bf40ca commit fe55dac
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion modules/setting/indexer.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func newIndexerService() {

Indexer.IssueQueueType = sec.Key("ISSUE_INDEXER_QUEUE_TYPE").MustString(LevelQueueType)
Indexer.IssueQueueDir = sec.Key("ISSUE_INDEXER_QUEUE_DIR").MustString(path.Join(AppDataPath, "indexers/issues.queue"))
Indexer.IssueQueueConnStr = sec.Key("ISSUE_INDEXER_QUEUE_CONN_STR").MustString(path.Join(AppDataPath, ""))
Indexer.IssueQueueConnStr = sec.Key("ISSUE_INDEXER_QUEUE_CONN_STR").MustString("")
Indexer.IssueQueueBatchNumber = sec.Key("ISSUE_INDEXER_QUEUE_BATCH_NUMBER").MustInt(20)

Indexer.RepoIndexerEnabled = sec.Key("REPO_INDEXER_ENABLED").MustBool(false)
Expand Down

0 comments on commit fe55dac

Please sign in to comment.