Skip to content

Commit 40a02d2

Browse files
committed
Revert "[supervisor] improve docker activation (#18284)"
This reverts commit 9bb400b.
1 parent 40b7cff commit 40a02d2

File tree

5 files changed

+74
-300
lines changed

5 files changed

+74
-300
lines changed

components/supervisor/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ require (
2424
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
2525
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3
2626
github.com/improbable-eng/grpc-web v0.14.0
27+
github.com/mailru/easygo v0.0.0-20190618140210-3c14a0dc985f
2728
github.com/prometheus/client_golang v1.14.0
2829
github.com/prometheus/client_model v0.3.0
2930
github.com/prometheus/common v0.42.0
@@ -115,7 +116,6 @@ require (
115116
github.com/mitchellh/go-homedir v1.1.0 // indirect
116117
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
117118
github.com/modern-go/reflect2 v1.0.2 // indirect
118-
github.com/moredure/easygo v0.0.0-20220122214504-21cd2ebdd15b
119119
github.com/opencontainers/go-digest v1.0.0 // indirect
120120
github.com/opencontainers/image-spec v1.0.2 // indirect
121121
github.com/opencontainers/runtime-spec v1.0.2 // indirect

components/supervisor/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/supervisor/pkg/activation/activation.go

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ import (
1010
"os"
1111
"sync"
1212

13-
"github.com/gitpod-io/gitpod/common-go/log"
14-
"github.com/moredure/easygo/netpoll"
13+
"github.com/mailru/easygo/netpoll"
1514
"golang.org/x/xerrors"
1615
)
1716

@@ -20,22 +19,16 @@ type Callback func(socketFD *os.File) error
2019

2120
// Listen polls on the listener and calls callback when someone writes to it.
2221
func Listen(ctx context.Context, l net.Listener, activate Callback) error {
23-
poller, err := netpoll.New(&netpoll.Config{
24-
OnWaitError: func(err error) {
25-
log.WithError(err).Error("netpoll: wait loop error")
26-
},
27-
})
22+
poller, err := netpoll.New(nil)
2823
if err != nil {
2924
return err
3025
}
31-
defer poller.Close()
3226

3327
// Get netpoll descriptor with EventRead|EventEdgeTriggered.
3428
desc, err := netpoll.HandleListener(l, netpoll.EventRead|netpoll.EventEdgeTriggered)
3529
if err != nil {
3630
return err
3731
}
38-
defer desc.Close()
3932

4033
var (
4134
runc = make(chan bool, 1)

components/supervisor/pkg/supervisor/docker.go

Lines changed: 0 additions & 287 deletions
This file was deleted.

0 commit comments

Comments
 (0)