Skip to content

Commit 04f2fe8

Browse files
committed
Enable test on drone and added docs
1 parent a185c4f commit 04f2fe8

File tree

6 files changed

+23
-2
lines changed

6 files changed

+23
-2
lines changed

.drone.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ steps:
142142
GOPROXY: off
143143
TAGS: bindata
144144
TEST_LDAP: 1
145+
TEST_INDEXER_CODE_ES_URL: "http://elastic:changeme@elasticsearch:9200"
145146
depends_on:
146147
- build
147148

custom/conf/app.ini.sample

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,15 @@ STARTUP_TIMEOUT=30s
393393

394394
; repo indexer by default disabled, since it uses a lot of disk space
395395
REPO_INDEXER_ENABLED = false
396+
; Code search engine type, could be `bleve` or `elasticsearch`.
397+
REPO_INDEXER_TYPE = bleve
398+
; Index file used for code search.
396399
REPO_INDEXER_PATH = indexers/repos.bleve
400+
; Code indexer connection string, available when `REPO_INDEXER_TYPE` is elasticsearch. i.e. http://elastic:changeme@localhost:9200
401+
REPO_INDEXER_CONN_STR =
402+
; Code indexer name, available when `REPO_INDEXER_TYPE` is elasticsearch
403+
`REPO_INDEXER_NAME` = gitea_codes
404+
397405
UPDATE_BUFFER_LEN = 20
398406
MAX_FILE_SIZE = 1048576
399407
; A comma separated list of glob patterns (see https://github.com/gobwas/glob) to include

docs/content/doc/advanced/config-cheat-sheet.en-us.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,11 @@ relation to port exhaustion.
240240
- `ISSUE_INDEXER_QUEUE_BATCH_NUMBER`: **20**: Batch queue number.
241241

242242
- `REPO_INDEXER_ENABLED`: **false**: Enables code search (uses a lot of disk space, about 6 times more than the repository size).
243+
- `REPO_INDEXER_TYPE`: **bleve**: Code search engine type, could be `bleve` or `elasticsearch`.
243244
- `REPO_INDEXER_PATH`: **indexers/repos.bleve**: Index file used for code search.
245+
- `REPO_INDEXER_CONN_STR`: ****: Code indexer connection string, available when `REPO_INDEXER_TYPE` is elasticsearch. i.e. http://elastic:changeme@localhost:9200
246+
- `REPO_INDEXER_NAME`: **gitea_codes**: Code indexer name, available when `REPO_INDEXER_TYPE` is elasticsearch
247+
244248
- `REPO_INDEXER_INCLUDE`: **empty**: A comma separated list of glob patterns (see https://github.com/gobwas/glob) to **include** in the index. Use `**.txt` to match any files with .txt extension. An empty list means include all files.
245249
- `REPO_INDEXER_EXCLUDE`: **empty**: A comma separated list of glob patterns (see https://github.com/gobwas/glob) to **exclude** from the index. Files that match this list will not be indexed, even if they match in `REPO_INDEXER_INCLUDE`.
246250
- `REPO_INDEXER_EXCLUDE_VENDORED`: **true**: Exclude vendored files from index.

docs/content/doc/advanced/config-cheat-sheet.zh-cn.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,12 @@ menu:
9898
- `ISSUE_INDEXER_QUEUE_CONN_STR`: **addrs=127.0.0.1:6379 db=0**: 当 `ISSUE_INDEXER_QUEUE_TYPE``redis` 时,保存Redis队列的连接字符串。
9999
- `ISSUE_INDEXER_QUEUE_BATCH_NUMBER`: **20**: 队列处理中批量提交数量。
100100

101-
- `REPO_INDEXER_ENABLED`: **false**: 是否启用代码搜索(启用后会占用比较大的磁盘空间)。
101+
- `REPO_INDEXER_ENABLED`: **false**: 是否启用代码搜索(启用后会占用比较大的磁盘空间,如果是bleve可能需要占用约6倍存储空间)。
102+
- `REPO_INDEXER_TYPE`: **bleve**: 代码搜索引擎类型,可以为 `bleve` 或者 `elasticsearch`
102103
- `REPO_INDEXER_PATH`: **indexers/repos.bleve**: 用于代码搜索的索引文件路径。
104+
- `REPO_INDEXER_CONN_STR`: ****: 代码搜索引擎连接字符串,当 `REPO_INDEXER_TYPE``elasticsearch` 时有效。例如: http://elastic:changeme@localhost:9200
105+
- `REPO_INDEXER_NAME`: **gitea_codes**: 代码搜索引擎的名字,当 `REPO_INDEXER_TYPE``elasticsearch` 时有效。
106+
103107
- `UPDATE_BUFFER_LEN`: **20**: 代码索引请求的缓冲区长度。
104108
- `MAX_FILE_SIZE`: **1048576**: 进行解析的源代码文件的最大长度,小于该值时才会索引。
105109

modules/indexer/code/indexer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func Init() {
121121
}
122122
}()
123123

124-
esIndexer, created, err := NewElasticSearchIndexer(setting.Indexer.RepoConnStr, "gitea_codes")
124+
esIndexer, created, err := NewElasticSearchIndexer(setting.Indexer.RepoConnStr, setting.Indexer.RepoIndexerName)
125125
if err != nil {
126126
if esIndexer != nil {
127127
esIndexer.Close()

modules/setting/indexer.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ var (
5757

5858
RepoIndexerEnabled: false,
5959
RepoType: "bleve",
60+
RepoPath: "indexers/repos.bleve",
61+
RepoConnStr: "",
6062
RepoIndexerName: "gitea_codes",
6163
MaxIndexerFileSize: 1024 * 1024,
6264
ExcludeVendored: true,
@@ -85,6 +87,8 @@ func newIndexerService() {
8587
Indexer.RepoPath = path.Join(AppWorkPath, Indexer.RepoPath)
8688
}
8789
Indexer.RepoConnStr = sec.Key("REPO_INDEXER_CONNSTR").MustString("")
90+
Indexer.RepoIndexerName = sec.Key("REPO_INDEXER_NAME").MustString("gitea_codes")
91+
8892
Indexer.IncludePatterns = IndexerGlobFromString(sec.Key("REPO_INDEXER_INCLUDE").MustString(""))
8993
Indexer.ExcludePatterns = IndexerGlobFromString(sec.Key("REPO_INDEXER_EXCLUDE").MustString(""))
9094
Indexer.ExcludeVendored = sec.Key("REPO_INDEXER_EXCLUDE_VENDORED").MustBool(true)

0 commit comments

Comments
 (0)