realaravinth/forgejo-federation
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity

Log the indexer path on failure (#11172)

Browse source 
Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
zeripath 2020-04-22 21:16:58 +01:00 committed by GitHub
parent 316db0fe79
commit b51fd30522
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/indexer/code/indexer.go
View file

@ -68,7 +68,7 @@ func Init() {
if err := recover(); err != nil { if err := recover(); err != nil {
log.Error("PANIC whilst initializing repository indexer: %v\nStacktrace: %s", err, log.Stack(2)) log.Error("PANIC whilst initializing repository indexer: %v\nStacktrace: %s", err, log.Stack(2))
log.Error("The indexer files are likely corrupted and may need to be deleted") log.Error("The indexer files are likely corrupted and may need to be deleted")
log.Error("You can completely remove the \"%s\" directory to make Gitea recreate the indexes", setting.Indexer.RepoPath) log.Error("You can completely remove the %q directory to make Gitea recreate the indexes", setting.Indexer.RepoPath)
cancel() cancel()
indexer.Close() indexer.Close()
close(waitChannel) close(waitChannel)

7
modules/indexer/issues/indexer.go
View file

@ -147,6 +147,7 @@ func InitIssueIndexer(syncReindex bool) {
if err := recover(); err != nil { if err := recover(); err != nil {
log.Error("PANIC whilst initializing issue indexer: %v\nStacktrace: %s", err, log.Stack(2)) log.Error("PANIC whilst initializing issue indexer: %v\nStacktrace: %s", err, log.Stack(2))
log.Error("The indexer files are likely corrupted and may need to be deleted") log.Error("The indexer files are likely corrupted and may need to be deleted")
log.Error("You can completely remove the %q directory to make Gitea recreate the indexes", setting.Indexer.IssuePath)
holder.cancel() holder.cancel()
log.Fatal("PID: %d Unable to initialize the Bleve Issue Indexer at path: %s Error: %v", os.Getpid(), setting.Indexer.IssuePath, err) log.Fatal("PID: %d Unable to initialize the Bleve Issue Indexer at path: %s Error: %v", os.Getpid(), setting.Indexer.IssuePath, err)
} }
@ -155,7 +156,7 @@ func InitIssueIndexer(syncReindex bool) {
exist, err := issueIndexer.Init() exist, err := issueIndexer.Init()
if err != nil { if err != nil {
holder.cancel() holder.cancel()
log.Fatal("Unable to initialize Bleve Issue Indexer: %v", err) log.Fatal("Unable to initialize Bleve Issue Indexer at path: %s Error: %v", setting.Indexer.IssuePath, err)
} }
populate = !exist populate = !exist
holder.set(issueIndexer) holder.set(issueIndexer)
@ -172,11 +173,11 @@ func InitIssueIndexer(syncReindex bool) {
graceful.GetManager().RunWithShutdownFns(func(_, atTerminate func(context.Context, func())) { graceful.GetManager().RunWithShutdownFns(func(_, atTerminate func(context.Context, func())) {
issueIndexer, err := NewElasticSearchIndexer(setting.Indexer.IssueConnStr, "gitea_issues") issueIndexer, err := NewElasticSearchIndexer(setting.Indexer.IssueConnStr, "gitea_issues")
if err != nil { if err != nil {
log.Fatal("Unable to initialize Elastic Search Issue Indexer: %v", err) log.Fatal("Unable to initialize Elastic Search Issue Indexer at connection: %s Error: %v", setting.Indexer.IssueConnStr, err)
} }
exist, err := issueIndexer.Init() exist, err := issueIndexer.Init()
if err != nil { if err != nil {
log.Fatal("Unable to issueIndexer.Init: %v", err) log.Fatal("Unable to issueIndexer.Init with connection %s Error: %v", setting.Indexer.IssueConnStr, err)
} }
populate = !exist populate = !exist
holder.set(issueIndexer) holder.set(issueIndexer)