Issues: Standardise the issues indexer queue settings

modules/indexer/issues/indexer.go

@@ -6,7 +6,6 @@ package issues
 
 import (
 	"context"
-	"encoding/json"
 	"os"
 	"sync"
 	"time"
@@ -113,64 +112,10 @@ func InitIssueIndexer(syncReindex bool) {
 			}
 		}
 
-		queueType := queue.PersistableChannelQueueType
-		switch setting.Indexer.IssueQueueType {
-		case setting.LevelQueueType:
-			queueType = queue.LevelQueueType
-		case setting.ChannelQueueType:
-			queueType = queue.PersistableChannelQueueType
-		case setting.RedisQueueType:
-			queueType = queue.RedisQueueType
-		default:
-			log.Fatal("Unsupported indexer queue type: %v",
-				setting.Indexer.IssueQueueType)
-		}
+		issueIndexerQueue = setting.CreateQueue("issue_indexer", handler, &IndexerData{})
 
-		name := "issue_indexer_queue"
-		opts := make(map[string]interface{})
-		opts["QueueLength"] = setting.Indexer.UpdateQueueLength
-		opts["BatchLength"] = setting.Indexer.IssueQueueBatchNumber
-		opts["DataDir"] = setting.Indexer.IssueQueueDir
-
-		addrs, password, dbIdx, err := setting.ParseQueueConnStr(setting.Indexer.IssueQueueConnStr)
-		if queueType == queue.RedisQueueType && err != nil {
-			log.Fatal("Unable to parse connection string for RedisQueueType: %s : %v",
-				setting.Indexer.IssueQueueConnStr,
-				err)
-		}
-		opts["Addresses"] = addrs
-		opts["Password"] = password
-		opts["DBIndex"] = dbIdx
-		opts["QueueName"] = name
-		opts["Name"] = name
-		opts["Workers"] = 1
-		opts["BlockTimeout"] = 1 * time.Second
-		opts["BoostTimeout"] = 5 * time.Minute
-		opts["BoostWorkers"] = 5
-		cfg, err := json.Marshal(opts)
-		if err != nil {
-			log.Error("Unable to marshall generic options: %v Error: %v", opts, err)
-			log.Fatal("Unable to create issue indexer queue with type %s: %v",
-				queueType,
-				err)
-		}
-		log.Debug("Creating issue indexer queue with type %s: configuration: %s", queueType, string(cfg))
-		issueIndexerQueue, err = queue.CreateQueue(queueType, handler, cfg, &IndexerData{})
-		if err != nil {
-			issueIndexerQueue, err = queue.CreateQueue(queue.WrappedQueueType, handler, queue.WrappedQueueConfiguration{
-				Underlying:  queueType,
-				Timeout:     setting.GracefulHammerTime + 30*time.Second,
-				MaxAttempts: 10,
-				Config:      cfg,
-				QueueLength: setting.Indexer.UpdateQueueLength,
-				Name:        name,
-			}, &IndexerData{})
-		}
-		if err != nil {
-			log.Fatal("Unable to create issue indexer queue with type %s: %v : %v",
-				queueType,
-				string(cfg),
-				err)
+		if issueIndexerQueue == nil {
+			log.Fatal("Unable to create issue indexer queue")
 		}
 	default:
 		issueIndexerQueue = &queue.DummyQueue{}