femsci/forgejo
femsci/forgejo
1
0
Fork 0
forked from NYANDEV/forgejo
Code Pull requests Activity

Stop logging CheckPath returns error: context canceled (#21064)

Browse source 
We should only log CheckPath errors if they are not simply due to
context cancellation - and we should add a little more context to the
error message.

Fix #20709

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2022-10-10 21:54:30 +01:00 committed by GitHub
parent 94037ada24
commit 3ccebf7f40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/git/repo_attribute.go
View file

@ -191,8 +191,8 @@ func (c *CheckAttributeReader) Run() error {
// CheckPath check attr for given path // CheckPath check attr for given path
func (c *CheckAttributeReader) CheckPath(path string) (rs map[string]string, err error) { func (c *CheckAttributeReader) CheckPath(path string) (rs map[string]string, err error) {
defer func() { defer func() {
if err != nil { if err != nil && err != c.ctx.Err() {
log.Error("CheckPath returns error: %v", err) log.Error("Unexpected error when checking path %s in %s. Error: %v", path, c.Repo.Path, err)
} }
}() }()

2
services/gitdiff/gitdiff.go
View file

@ -1178,8 +1178,6 @@ func GetDiff(gitRepo *git.Repository, opts *DiffOptions, files ...string) (*Diff
} else if language, has := attrs["gitlab-language"]; has && language != "unspecified" && language != "" { } else if language, has := attrs["gitlab-language"]; has && language != "unspecified" && language != "" {
diffFile.Language = language diffFile.Language = language
} }
} else {
log.Error("Unexpected error: %v", err)
} }
} }