mirrors/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-01-30 10:48:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into graceful-queues

Browse source
This commit is contained in:
Andrew Thornton 2019-12-30 17:56:12 +00:00
parent b1c9fa7f1a
commit 4d8b8ed02e
No known key found for this signature in database
GPG key ID: 3CDE74631F13A748
3 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/indexer/issues/bleve.go
View file

@ -266,8 +266,3 @@ func (b *BleveIndexer) Search(keyword string, repoIDs []int64, limit, start int)
} }
return &ret, nil return &ret, nil
} }
// Close the Index
func (b *BleveIndexer) Close() error {
return b.indexer.Close()
}

3
modules/indexer/issues/db.go
View file

@ -26,8 +26,7 @@ func (db *DBIndexer) Delete(ids ...int64) error {
} }
// Close dummy function // Close dummy function
func (db *DBIndexer) Close() error { func (db *DBIndexer) Close() {
return nil
} }
// Search dummy function // Search dummy function

7
modules/indexer/issues/indexer.go
View file

@ -48,7 +48,7 @@ type Indexer interface {
Index(issue []*IndexerData) error Index(issue []*IndexerData) error
Delete(ids ...int64) error Delete(ids ...int64) error
Search(kw string, repoIDs []int64, limit, start int) (*SearchResult, error) Search(kw string, repoIDs []int64, limit, start int) (*SearchResult, error)
Close() error Close()
} }
type indexerHolder struct { type indexerHolder struct {
@ -156,10 +156,7 @@ func InitIssueIndexer(syncReindex bool) {
log.Debug("Closing issue indexer") log.Debug("Closing issue indexer")
issueIndexer := holder.get() issueIndexer := holder.get()
if issueIndexer != nil { if issueIndexer != nil {
err := issueIndexer.Close() issueIndexer.Close()
if err != nil {
log.Error("Error whilst closing the issue indexer: %v", err)
}
} }
log.Info("PID: %d Issue Indexer closed", os.Getpid()) log.Info("PID: %d Issue Indexer closed", os.Getpid())
}) })