Merge pull request #4084 from apostasie/fix-fahedouch-owes-me-a-beer-in-paris

fahedouch · web-flow · commit 87a9f52da33b · 2025-04-04T21:04:22.000+01:00
Fix logging regression
diff --git a/pkg/logging/logging.go b/pkg/logging/logging.go
@@ -164,7 +164,7 @@ func WaitForLogger(dataStore, ns, id string) error {
 }
 
 func getContainerWait(ctx context.Context, address string, config *logging.Config) (<-chan containerd.ExitStatus, error) {
-	client, err := containerd.New(address, containerd.WithDefaultNamespace(config.Namespace))
+	client, err := containerd.New(strings.TrimPrefix(address, "unix://"), containerd.WithDefaultNamespace(config.Namespace))
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ func WaitForLogger(dataStore, ns, id string) error {`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`func getContainerWait(ctx context.Context, address string, config *logging.Config) (<-chan containerd.ExitStatus, error) {`
`167`		`- client, err := containerd.New(address, containerd.WithDefaultNamespace(config.Namespace))`
	`167`	`+ client, err := containerd.New(strings.TrimPrefix(address, "unix://"), containerd.WithDefaultNamespace(config.Namespace))`
`168`	`168`	`if err != nil {`
`169`	`169`	`return nil, err`
`170`	`170`	`}`