Fix to use proper context

cybozu-go · Jul 19, 2019 · 48324e6 · 48324e6
1 parent b0e4c76
commit 48324e6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/cluster.go b/cluster.go
@@ -238,7 +238,10 @@ func (c *Cluster) Start(ctx context.Context, r *Runtime) error {
 	for _, n := range c.Nodes {
 		n := n
 		if n.TPM {
-			env.Go(n.StartSWTPM)
+			env.Go(func(ctx2 context.Context) error {
+				// reference the original context because ctx2 will soon be cancelled.
+				return n.StartSWTPM(ctx)
+			})
 			for {
 				_, err := os.Stat(n.swtpmSocket)
 				if err == nil {

diff --git a/node.go b/node.go
@@ -357,12 +357,16 @@ func (n *Node) StartSWTPM(ctx context.Context) error {
 		return err
 	}
 
-	err = well.CommandContext(ctx, "swtpm", "socket",
+	c := well.CommandContext(ctx, "swtpm", "socket",
 		"--tpmstate", "dir="+dirName,
 		"--tpm2",
 		"--ctrl",
 		"type=unixio,path="+n.swtpmSocket,
-	).Start()
+	)
+	c.Stdout = os.Stdout
+	c.Stderr = os.Stderr
+
+	err = c.Start()
 	if err != nil {
 		return err
 	}