Merge pull request #3050 from jterry75/fix_cpu_cap

dmcgowan · web-flow · commit c24a74354cce · 2019-02-27T17:32:38.000-08:00
Fix a bug in shim log on Windows that can cause 100% CPU utilization
diff --git a/runtime/v2/shim_windows.go b/runtime/v2/shim_windows.go
@@ -78,7 +78,7 @@ func openShimLog(ctx context.Context, bundle *Bundle) (io.ReadCloser, error) {
 			time.Second*10,
 		)
 		if conerr != nil {
-			dpc.conerr = errors.Wrap(err, "failed to connect to shim log")
+			dpc.conerr = errors.Wrap(conerr, "failed to connect to shim log")
 		}
 		dpc.c = c
 		dpc.wg.Done()

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func openShimLog(ctx context.Context, bundle *Bundle) (io.ReadCloser, error) {`
`78`	`78`	`time.Second*10,`
`79`	`79`	`)`
`80`	`80`	`if conerr != nil {`
`81`		`- dpc.conerr = errors.Wrap(err, "failed to connect to shim log")`
	`81`	`+ dpc.conerr = errors.Wrap(conerr, "failed to connect to shim log")`
`82`	`82`	`}`
`83`	`83`	`dpc.c = c`
`84`	`84`	`dpc.wg.Done()`