refactor

Author: evgeniy-scherbina

cli/cli.go

@@ -94,18 +94,21 @@ func BaseCommand() *serpent.Command {
 	}
 }
 
+func isChild() bool {
+	return os.Getenv("CHILD") == "true"
+}
+
 // Run executes the boundary command with the given configuration and arguments
 func Run(ctx context.Context, config Config, args []string) error {
-	isChild := os.Getenv("CHILD") == "true"
-	if isChild {
-		log.Printf("CHILD process is started")
-		vethNetJail := os.Getenv("VETH_JAIL_NAME")
+	if isChild() {
+		log.Printf("boundary CHILD process is started")
 
+		vethNetJail := os.Getenv("VETH_JAIL_NAME")
 		err := jail.SetupChildNetworking(vethNetJail)
 		if err != nil {
-			return fmt.Errorf("failed to run SetupChildNetworking: %v", err)
+			return fmt.Errorf("failed to setup child networking: %v", err)
 		}
-		log.Printf("child networking is configured")
+		log.Printf("child networking is successfully configured")
 
 		// Program to run
 		bin := args[0]
@@ -117,10 +120,9 @@ func Run(ctx context.Context, config Config, args []string) error {
 		cmd.Stderr = os.Stderr
 		err = cmd.Run()
 		if err != nil {
-			log.Printf("failed to run %s: %v, output: %s", bin, err, "output")
+			log.Printf("failed to run %s: %v", bin, err)
 			return err
 		}
-		log.Printf("successfully run %s: %s", bin, "output")
 
 		return nil
 	}
@@ -227,18 +229,21 @@ func Run(ctx context.Context, config Config, args []string) error {
 		logger.Debug("Executing command in boundary", "command", strings.Join(os.Args, " "))
 		err := cmd.Start()
 		if err != nil {
-			logger.Error("Command execution failed(Start)", "error", err)
+			logger.Error("Command failed to start", "error", err)
+			return
 		}
 
 		err = boundaryInstance.ConfigureAfterCommandExecution(cmd.Process.Pid)
 		if err != nil {
-			logger.Error("configuration failed", "error", err)
+			logger.Error("configuration after command execution failed", "error", err)
+			return
 		}
 
 		logger.Debug("waiting on a child process to finish")
 		err = cmd.Wait()
 		if err != nil {
-			logger.Error("Command execution failed(Wait)", "error", err)
+			logger.Error("Command execution failed", "error", err)
+			return
 		}
 	}()