cleanup

Author: drewkerrigan

records/generator.go

@@ -293,13 +293,11 @@ func (rg *RecordGenerator) loadWrap(ip, port string) (state.State, error) {
 		}
 		if rip != ip {
 			logging.VeryVerbose.Println("Warning: master changed to " + ip)
-			sj, err = rg.loadFromMaster(rip, port)
-			return sj, err
+			return rg.loadFromMaster(rip, port)
 		}
 		return sj, nil
 	}
-	msg := "Fetched state.json does not contain leader information"
-	err = errors.New(msg)
+	err = errors.New("Fetched state.json does not contain leader information")
 	return sj, err
 }
 
@@ -668,11 +666,11 @@ func leaderIP(leader string) (string, error) {
 		return "", errors.New("Invalid leader address: " + leader)
 	}
 	hostPort := nameAddressPair[1]
-	hostPortPair := strings.Split(hostPort, ":")
-	if len(hostPortPair) != 2 {
-		return "", errors.New("Invalid leader address: " + leader)
+	host, _, err := net.SplitHostPort(hostPort)
+	if err != nil {
+		return "", err
 	}
-	return hostPortPair[0], nil
+	return host, nil
 }
 
 // return the slave number from a Mesos slave id