Guard against a node name containing pure whitespace

2016-03-31 15:02:58 -07:00 · 2016-03-31 15:02:58 -07:00 · faa2aa4436
parent c03d025903
commit faa2aa4436
1 changed files with 5 additions and 6 deletions
--- a/command/agent/command.go
+++ b/command/agent/command.go
@ -167,14 +167,13 @@ func (c *Command) readConfig() *Config {
 			c.Ui.Error(fmt.Sprintf("Error determining node name: %s", err))
 			return nil
 		}
-
-		hostname = strings.TrimSpace(hostname)
-		if hostname == "" {
-			c.Ui.Error("Node name can not be empty")
-			return nil
-		}
 		config.NodeName = hostname
 	}
+	hostname = strings.TrimSpace(hostname)
+	if hostname == "" {
+		c.Ui.Error("Node name can not be empty")
+		return nil
+	}

 	// Ensure we have a data directory
 	if config.DataDir == "" && !dev {