Merge pull request #5378 from Iceber/check-flag

mxpv · web-flow · commit 69a30ad58140 · 2021-04-18T09:10:46.000-07:00
runtime/shim: check the namespace flag first
diff --git a/runtime/v2/shim/shim.go b/runtime/v2/shim/shim.go
@@ -175,30 +175,30 @@ func run(id string, initFunc Init, config Config) error {
 		return nil
 	}
 
+	if namespaceFlag == "" {
+		return fmt.Errorf("shim namespace cannot be empty")
+	}
+
 	setRuntime()
 
 	signals, err := setupSignals(config)
 	if err != nil {
 		return err
 	}
+
 	if !config.NoSubreaper {
 		if err := subreaper(); err != nil {
 			return err
 		}
 	}
 
 	ttrpcAddress := os.Getenv(ttrpcAddressEnv)
-
 	publisher, err := NewPublisher(ttrpcAddress)
 	if err != nil {
 		return err
 	}
-
 	defer publisher.Close()
 
-	if namespaceFlag == "" {
-		return fmt.Errorf("shim namespace cannot be empty")
-	}
 	ctx := namespaces.WithNamespace(context.Background(), namespaceFlag)
 	ctx = context.WithValue(ctx, OptsKey{}, Opts{BundlePath: bundlePath, Debug: debugFlag})
 	ctx = log.WithLogger(ctx, log.G(ctx).WithField("runtime", id))
@@ -207,6 +207,7 @@ func run(id string, initFunc Init, config Config) error {
 	if err != nil {
 		return err
 	}
+
 	switch action {
 	case "delete":
 		logger := logrus.WithFields(logrus.Fields{
