summaryrefslogtreecommitdiff
path: root/socket_factory.go
diff options
context:
space:
mode:
authorValery Piashchynski <[email protected]>2020-11-26 12:44:12 +0300
committerValery Piashchynski <[email protected]>2020-11-26 12:44:12 +0300
commit574f351aaecdee1176b9700bb6d7eb61fe170906 (patch)
tree6271704950d2c89a43de3edafb677a003d50a406 /socket_factory.go
parente5313529e4293b7ad985cce72cec54b08462259d (diff)
Remove context from worker wait function. Explicitly enable ubuntu 20.04
in the CI
Diffstat (limited to 'socket_factory.go')
-rwxr-xr-xsocket_factory.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/socket_factory.go b/socket_factory.go
index c6120b85..472e5a05 100755
--- a/socket_factory.go
+++ b/socket_factory.go
@@ -110,7 +110,7 @@ func (f *SocketFactory) SpawnWorkerWithContext(ctx context.Context, cmd *exec.Cm
err = multierr.Combine(
err,
w.Kill(),
- w.Wait(context.Background()),
+ w.Wait(),
)
c <- socketSpawn{
@@ -142,7 +142,6 @@ func (f *SocketFactory) SpawnWorkerWithContext(ctx context.Context, cmd *exec.Cm
}
func (f *SocketFactory) SpawnWorker(cmd *exec.Cmd) (WorkerBase, error) {
- ctx := context.Background()
const op = errors.Op("spawn_worker")
w, err := InitBaseWorker(cmd)
if err != nil {
@@ -159,7 +158,7 @@ func (f *SocketFactory) SpawnWorker(cmd *exec.Cmd) (WorkerBase, error) {
err = multierr.Combine(
err,
w.Kill(),
- w.Wait(ctx),
+ w.Wait(),
)
return nil, err
}