Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop logging CheckPath returns error: context canceled #21064

Merged
merged 10 commits into from
Oct 10, 2022
Merged

Stop logging CheckPath returns error: context canceled #21064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e62cb21
Stop logging CheckPath returns error: context canceled
zeripath Sep 4, 2022
e6d459c
Update modules/git/repo_attribute.go
zeripath Sep 4, 2022
01318f6
Merge branch 'main' into fix-20709-prevent-logging-context-cancelled
lunny Sep 5, 2022
53b3e2c
Merge branch 'main' into fix-20709-prevent-logging-context-cancelled
zeripath Sep 7, 2022
fa6b1aa
Merge branch 'main' into fix-20709-prevent-logging-context-cancelled
zeripath Oct 5, 2022
bcac477
Merge branch 'main' into fix-20709-prevent-logging-context-cancelled
zeripath Oct 6, 2022
286ba5d
Merge branch 'main' into fix-20709-prevent-logging-context-cancelled
zeripath Oct 7, 2022
ae126b7
Merge branch 'main' into fix-20709-prevent-logging-context-cancelled
zeripath Oct 7, 2022
30d6692
Merge branch 'main' into fix-20709-prevent-logging-context-cancelled
zeripath Oct 8, 2022
fec1e7b
Merge branch 'main' into fix-20709-prevent-logging-context-cancelled
zeripath Oct 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/git/repo_attribute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ func (c *CheckAttributeReader) Run() error {
// CheckPath check attr for given path
func (c *CheckAttributeReader) CheckPath(path string) (rs map[string]string, err error) {
defer func() {
if err != nil {
log.Error("CheckPath returns error: %v", err)
if err != nil && err != c.ctx.Err() {
log.Error("Unexpected error when checking path %s in %s. Error: %v", path, c.Repo.Path, err)
}
}()

Expand Down
2 changes: 0 additions & 2 deletions services/gitdiff/gitdiff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 != "" {
diffFile.Language = language
}
} else {
log.Error("Unexpected error: %v", err)
zeripath marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down