Merge branch 'master' into graceful-queues

modules/indexer/issues/bleve.go

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

modules/indexer/issues/db.go

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

modules/indexer/issues/indexer.go

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