sync varlink/bridge.go varlink/bridge_windows.go

boot2podman · Jan 14, 2019 · 9df428d · 9df428d
1 parent 09b2c97
commit 9df428d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/varlink/bridge.go b/varlink/bridge.go
@@ -11,7 +11,7 @@ import (
 
 type PipeCon struct {
 	net.Conn
-	cmd *exec.Cmd
+	cmd    *exec.Cmd
 	reader *io.ReadCloser
 	writer *io.WriteCloser
 }
@@ -44,7 +44,7 @@ func NewBridge(bridge string) (*Connection, error) {
 	if err != nil {
 		return nil, err
 	}
-	c.conn = PipeCon{nil, cmd, &r, &w,}
+	c.conn = PipeCon{nil, cmd, &r, &w}
 	c.address = ""
 	c.reader = bufio.NewReader(r)
 	c.writer = bufio.NewWriter(w)

diff --git a/varlink/bridge_windows.go b/varlink/bridge_windows.go
@@ -3,13 +3,13 @@ package varlink
 import (
 	"bufio"
 	"io"
-	"log"
 	"net"
 	"os/exec"
 )
 
 type PipeCon struct {
 	net.Conn
+	cmd    *exec.Cmd
 	reader *io.ReadCloser
 	writer *io.WriteCloser
 }
@@ -23,6 +23,8 @@ func (p PipeCon) Close() error {
 	if err2 != nil {
 		return err2
 	}
+	p.cmd.Wait()
+
 	return nil
 }
 
@@ -40,17 +42,15 @@ func NewBridge(bridge string) (*Connection, error) {
 	if err != nil {
 		return nil, err
 	}
-	c.conn = PipeCon{nil, &r, &w}
+	c.conn = PipeCon{nil, cmd, &r, &w}
 	c.address = ""
 	c.reader = bufio.NewReader(r)
 	c.writer = bufio.NewWriter(w)
 
-	go func() {
-		err := cmd.Run()
-		if err != nil {
-			log.Fatal(err)
-		}
-	}()
+	err = cmd.Start()
+	if err != nil {
+		return nil, err
+	}
 
 	return &c, nil
 }