M command/agent/agent.go → command/agent/agent.go

@@ -19,8 +19,11 @@ // note that this value interacts with serf's LeavePropagateDelay config
 const gracefulTimeout = 10 * time.Second
 
 func Run(args []string) {
-	// do flags
-	config := configureAgent()
+	config, err := configureAgent()
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
 	agent := agent.New(config)
 	if err := agent.Start(); err != nil {
 		fmt.Println(err)
@@ -104,14 +107,13 @@ 
 	return nil
 }
 
-func configureAgent() *agent.Config {
+func configureAgent() (*agent.Config, error) {
 	config := agent.DefaultConfig()
 	// CASCADE_BIND=192.168.0.15:12345
 	if os.Getenv("CASCADE_BIND") != "" {
 		err := parseFlagAddress(os.Getenv("CASCADE_BIND"), config.BindAddr)
 		if err != nil {
-			fmt.Printf("Error parsing CASCADE_BIND: %s\n", err)
-			os.Exit(1)
+			return nil, err
 		}
 	}
 	// CASCADE_JOIN=127.0.0.1,127.0.0.5
@@ -122,7 +124,7 @@ // CASCADE_NAME=nostromo.j3s.sh
 	if os.Getenv("CASCADE_NAME") != "" {
 		config.NodeName = os.Getenv("CASCADE_NAME")
 	}
-	return config
+	return config, nil
 }
 
 // parseFlagAddress takes a colon-delimited host:port pair as a string, parses