From 3ccebf7f4044b85eef975e4544785893da763bd2 Mon Sep 17 00:00:00 2001 From: zeripath Date: Mon, 10 Oct 2022 21:54:30 +0100 Subject: Stop logging CheckPath returns error: context canceled (#21064) 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 --- modules/git/repo_attribute.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/git/repo_attribute.go') diff --git a/modules/git/repo_attribute.go b/modules/git/repo_attribute.go index 1305e6f224..21ff93e498 100644 --- a/modules/git/repo_attribute.go +++ b/modules/git/repo_attribute.go @@ -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) } }() -- cgit v1.2.3