Merge pull request containerd#10152 from zouyee/log

Maksym Pavlenko · web-flow · commit 9e1ad56b41f8 · 2024-04-30T18:22:01.000Z
optimize error logs by providing absolute file paths
diff --git a/core/remotes/docker/config/hosts.go b/core/remotes/docker/config/hosts.go
@@ -308,7 +308,7 @@ func loadHostDir(ctx context.Context, hostsDir string) ([]hostConfig, error) {
 
 	hosts, err := parseHostsFile(hostsDir, b)
 	if err != nil {
-		log.G(ctx).WithError(err).Error("failed to decode hosts.toml")
+		log.G(ctx).WithError(err).Errorf("failed to decode %s", filepath.Join(hostsDir, "hosts.toml"))
 		// Fallback to checking certificate files
 		return loadCertFiles(ctx, hostsDir)
 	}

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ func loadHostDir(ctx context.Context, hostsDir string) ([]hostConfig, error) {`
`308`	`308`
`309`	`309`	`hosts, err := parseHostsFile(hostsDir, b)`
`310`	`310`	`if err != nil {`
`311`		`- log.G(ctx).WithError(err).Error("failed to decode hosts.toml")`
	`311`	`+ log.G(ctx).WithError(err).Errorf("failed to decode %s", filepath.Join(hostsDir, "hosts.toml"))`
`312`	`312`	`// Fallback to checking certificate files`
`313`	`313`	`return loadCertFiles(ctx, hostsDir)`
`314`	`314`	`}`