Merge pull request #3239 from sipsma/nosetuplog

estesp · web-flow · commit 810b3c37bb13 · 2019-04-25T17:48:11.000-04:00
Support disabling default setup of shim logger.
diff --git a/runtime/v2/shim/shim.go b/runtime/v2/shim/shim.go
@@ -78,6 +78,8 @@ type Config struct {
 	NoSubreaper bool
 	// NoReaper disables the shim binary from reaping any child process implicitly
 	NoReaper bool
+	// NoSetupLogger disables automatic configuration of logrus to use the shim FIFO
+	NoSetupLogger bool
 }
 
 var (
@@ -206,8 +208,10 @@ func run(id string, initFunc Init, config Config) error {
 		}
 		return nil
 	default:
-		if err := setLogger(ctx, idFlag); err != nil {
-			return err
+		if !config.NoSetupLogger {
+			if err := setLogger(ctx, idFlag); err != nil {
+				return err
+			}
 		}
 		client := NewShimClient(ctx, service, signals)
 		if err := client.Serve(); err != nil {
