Skip to content

Commit 95aa393

Browse files
committed
[supervisor] don't log expected docker activation socket errors
1 parent 6a87b03 commit 95aa393

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

components/supervisor/pkg/supervisor/supervisor.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ import (
5050
"github.com/gitpod-io/gitpod/common-go/analytics"
5151
"github.com/gitpod-io/gitpod/common-go/log"
5252
"github.com/gitpod-io/gitpod/common-go/pprof"
53+
"github.com/gitpod-io/gitpod/common-go/process"
5354
csapi "github.com/gitpod-io/gitpod/content-service/api"
5455
"github.com/gitpod-io/gitpod/content-service/pkg/executor"
5556
"github.com/gitpod-io/gitpod/content-service/pkg/git"
@@ -1603,7 +1604,10 @@ func socketActivationForDocker(ctx context.Context, wg *sync.WaitGroup, term *te
16031604
cancel()
16041605
return err
16051606
})
1606-
if err != nil && !errors.Is(err, context.Canceled) && err.Error() != "signal: killed" {
1607+
if err != nil &&
1608+
!errors.Is(err, context.Canceled) &&
1609+
!process.IsNotChildProcess(err) &&
1610+
!strings.Contains(err.Error(), "signal: ") {
16071611
log.WithError(err).Error("cannot provide Docker activation socket")
16081612
}
16091613
}

0 commit comments

Comments
 (0)