Skip to content

Commit b51fd30

Browse files
zeripathlunnylafriks
authored
Log the indexer path on failure (#11172)
Signed-off-by: Andrew Thornton <[email protected]> Co-authored-by: Lunny Xiao <[email protected]> Co-authored-by: Lauris BH <[email protected]>
1 parent 316db0f commit b51fd30

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

modules/indexer/code/indexer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func Init() {
6868
if err := recover(); err != nil {
6969
log.Error("PANIC whilst initializing repository indexer: %v\nStacktrace: %s", err, log.Stack(2))
7070
log.Error("The indexer files are likely corrupted and may need to be deleted")
71-
log.Error("You can completely remove the \"%s\" directory to make Gitea recreate the indexes", setting.Indexer.RepoPath)
71+
log.Error("You can completely remove the %q directory to make Gitea recreate the indexes", setting.Indexer.RepoPath)
7272
cancel()
7373
indexer.Close()
7474
close(waitChannel)

modules/indexer/issues/indexer.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ func InitIssueIndexer(syncReindex bool) {
147147
if err := recover(); err != nil {
148148
log.Error("PANIC whilst initializing issue indexer: %v\nStacktrace: %s", err, log.Stack(2))
149149
log.Error("The indexer files are likely corrupted and may need to be deleted")
150+
log.Error("You can completely remove the %q directory to make Gitea recreate the indexes", setting.Indexer.IssuePath)
150151
holder.cancel()
151152
log.Fatal("PID: %d Unable to initialize the Bleve Issue Indexer at path: %s Error: %v", os.Getpid(), setting.Indexer.IssuePath, err)
152153
}
@@ -155,7 +156,7 @@ func InitIssueIndexer(syncReindex bool) {
155156
exist, err := issueIndexer.Init()
156157
if err != nil {
157158
holder.cancel()
158-
log.Fatal("Unable to initialize Bleve Issue Indexer: %v", err)
159+
log.Fatal("Unable to initialize Bleve Issue Indexer at path: %s Error: %v", setting.Indexer.IssuePath, err)
159160
}
160161
populate = !exist
161162
holder.set(issueIndexer)
@@ -172,11 +173,11 @@ func InitIssueIndexer(syncReindex bool) {
172173
graceful.GetManager().RunWithShutdownFns(func(_, atTerminate func(context.Context, func())) {
173174
issueIndexer, err := NewElasticSearchIndexer(setting.Indexer.IssueConnStr, "gitea_issues")
174175
if err != nil {
175-
log.Fatal("Unable to initialize Elastic Search Issue Indexer: %v", err)
176+
log.Fatal("Unable to initialize Elastic Search Issue Indexer at connection: %s Error: %v", setting.Indexer.IssueConnStr, err)
176177
}
177178
exist, err := issueIndexer.Init()
178179
if err != nil {
179-
log.Fatal("Unable to issueIndexer.Init: %v", err)
180+
log.Fatal("Unable to issueIndexer.Init with connection %s Error: %v", setting.Indexer.IssueConnStr, err)
180181
}
181182
populate = !exist
182183
holder.set(issueIndexer)

0 commit comments

Comments
 (0)