Merge pull request #3252 from jterry75/remove_log_connect_error

dmcgowan · web-flow · commit 82f2ac7edec0 · 2019-05-03T17:03:49.000-07:00
Stop logging error on v2 multi shim log failure
diff --git a/runtime/v2/binary.go b/runtime/v2/binary.go
@@ -84,7 +84,12 @@ func (b *binary) Start(ctx context.Context) (_ *shim, err error) {
 	go func() {
 		defer f.Close()
 		if _, err := io.Copy(os.Stderr, f); err != nil {
-			log.G(ctx).WithError(err).Error("copy shim log")
+			// When using a multi-container shim the 2nd to Nth container in the
+			// shim will not have a seperate log pipe. Ignore the failure log
+			// message here when the shim connect times out.
+			if !os.IsNotExist(errors.Cause(err)) {
+				log.G(ctx).WithError(err).Error("copy shim log")
+			}
 		}
 	}()
 	out, err := cmd.CombinedOutput()
diff --git a/runtime/v2/shim.go b/runtime/v2/shim.go
@@ -70,7 +70,12 @@ func loadShim(ctx context.Context, bundle *Bundle, events *exchange.Exchange, rt
 	go func() {
 		defer f.Close()
 		if _, err := io.Copy(os.Stderr, f); err != nil {
-			log.G(ctx).WithError(err).Error("copy shim log")
+			// When using a multi-container shim the 2nd to Nth container in the
+			// shim will not have a seperate log pipe. Ignore the failure log
+			// message here when the shim connect times out.
+			if !os.IsNotExist(errors.Cause(err)) {
+				log.G(ctx).WithError(err).Error("copy shim log")
+			}
 		}
 	}()
 
