improve code

go-gitea · Feb 12, 2020 · e41403b · e41403b
1 parent a4b8ab7
commit e41403b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md
@@ -228,10 +228,10 @@ relation to port exhaustion.
 
 ## Indexer (`indexer`)
 
-- `ISSUE_INDEXER_TYPE`: **bleve**: Issue indexer type, currently support: bleve, db or elasticsearch, if it's db, below issue indexer item will be invalid.
+- `ISSUE_INDEXER_TYPE`: **bleve**: Issue indexer type, currently supported: `bleve`, `db` or `elasticsearch`.
 - `ISSUE_INDEXER_CONN_STR`: ****: Issue indexer connection string, available when ISSUE_INDEXER_TYPE is elasticsearch. i.e. http:https://elastic:changeme@localhost:9200
 - `ISSUE_INDEXER_NAME`: **gitea_issues**: Issue indexer name, available when ISSUE_INDEXER_TYPE is elasticsearch
-- `ISSUE_INDEXER_PATH`: **indexers/issues.bleve**: Index file used for issue search.
+- `ISSUE_INDEXER_PATH`: **indexers/issues.bleve**: Index file used for issue search; available when ISSUE_INDEXER_TYPE is bleve and elasticsearch.
 - The next 4 configuration values are deprecated and should be set in `queue.issue_indexer` however are kept for backwards compatibility:
 - `ISSUE_INDEXER_QUEUE_TYPE`: **levelqueue**: Issue indexer queue, currently supports:`channel`, `levelqueue`, `redis`.
 - `ISSUE_INDEXER_QUEUE_DIR`: **indexers/issues.queue**: When `ISSUE_INDEXER_QUEUE_TYPE` is `levelqueue`, this will be the queue will be saved path.

diff --git a/modules/indexer/issues/bleve.go b/modules/indexer/issues/bleve.go
@@ -170,7 +170,7 @@ func NewBleveIndexer(indexDir string) *BleveIndexer {
  }
 }
 
-// Init will initial the indexer
+// Init will initialize the indexer
 func (b *BleveIndexer) Init() (bool, error) {
  var err error
  b.indexer, err = openIndexer(b.indexDir, issueIndexerLatestVersion)

diff --git a/modules/indexer/issues/elastic_search.go b/modules/indexer/issues/elastic_search.go
@@ -93,7 +93,7 @@ const (
  }`
 )
 
-// Init will initial the indexer
+// Init will initialize the indexer
 func (b *ElasticSearchIndexer) Init() (bool, error) {
  ctx := context.Background()
  exists, err := b.client.IndexExists(b.indexerName).Do(ctx)
@@ -142,7 +142,6 @@ func (b *ElasticSearchIndexer) Index(issues []*IndexerData) error {
  reqs = append(reqs,
  elastic.NewBulkIndexRequest().
  Index(b.indexerName).
- //Type(b.typeName).
  Id(fmt.Sprintf("%d", issue.ID)).
  Doc(map[string]interface{}{
  "id": issue.ID,