fix bug

Author: lunny

models/issue_indexer.go

@@ -26,7 +26,6 @@ func InitIssueIndexer() error {
 	if err != nil {
 		return err
 	}
-
 	if !exist {
 		go populateIssueIndexer()
 	}

models/unit_tests.go

@@ -44,6 +44,10 @@ func MainTest(m *testing.M, pathToGiteaRoot string) {
 		fatalTestError("Error creating test engine: %v\n", err)
 	}
 
+	if err = InitIssueIndexer(); err != nil {
+		fatalTestError("Error InitIssueIndexer: %v\n", err)
+	}
+
 	setting.AppURL = "https://try.gitea.io/"
 	setting.RunUser = "runuser"
 	setting.SSH.Port = 3000

modules/indexer/issues/queue_ledis_local.go

@@ -60,6 +60,13 @@ func (l *LedisLocalQueue) Run() error {
 			continue
 		}
 
+		i++
+		if len(datas) > l.batchNumber || (len(datas) > 0 && i > 3) {
+			l.indexer.Index(datas)
+			datas = make([]*IndexerData, 0, l.batchNumber)
+			i = 0
+		}
+
 		if len(bs) <= 0 {
 			time.Sleep(time.Millisecond * 100)
 			continue
@@ -76,14 +83,7 @@ func (l *LedisLocalQueue) Run() error {
 		log.Trace("LedisLocalQueue: task found: %#v", data)
 
 		datas = append(datas, &data)
-		i++
-
-		if len(datas) > l.batchNumber || i > 3 {
-			l.indexer.Index(datas)
-			datas = make([]*IndexerData, 0, l.batchNumber)
-			i = 0
-		}
-		time.Sleep(time.Millisecond * 100)
+		time.Sleep(time.Millisecond * 10)
 	}
 }
 

modules/setting/setting.go

@@ -186,7 +186,7 @@ var (
 	DBConnectBackoff time.Duration
 
 	// Indexer settings
-	Indexer struct {
+	Indexer = struct {
 		IssuePath                    string
 		RepoIndexerEnabled           bool
 		RepoPath                     string
@@ -196,6 +196,12 @@ var (
 		IssueIndexerQueueDir         string
 		IssueIndexerQueueDBIndex     int
 		IssueIndexerQueueBatchNumber int
+	}{
+		IssuePath:                    "indexers/issues.bleve",
+		IssueIndexerQueueType:        LedisLocalQueueType,
+		IssueIndexerQueueDir:         "indexers/issues.queue",
+		IssueIndexerQueueBatchNumber: 20,
+		IssueIndexerQueueDBIndex:     0,
 	}
 
 	// Repository settings

routers/init.go

@@ -90,7 +90,9 @@ func GlobalInit() {
 
 		// Booting long running goroutines.
 		cron.NewContext()
-		models.InitIssueIndexer()
+		if err := models.InitIssueIndexer(); err != nil {
+			log.Fatal(4, "Failed to initialize issue indexer: %v", err)
+		}
 		models.InitRepoIndexer()
 		models.InitSyncMirrors()
 		models.InitDeliverHooks()