rebase, cleanup

Author: drewkerrigan

records/generator.go

@@ -170,7 +170,7 @@ func (rg *RecordGenerator) ParseState(c Config, masters ...string) error {
 	// find master -- return if error
 	sj, err := rg.findMaster(masters...)
 	if err != nil {
-		logging.Error.Println("Failed to fetch state.json")
+		logging.Error.Println("Failed to fetch state.json. Error: ", err)
 		return err
 	}
 	if sj.Leader == "" {
@@ -230,7 +230,7 @@ func (rg *RecordGenerator) findMaster(masters ...string) (state.State, error) {
 		return sj, nil
 	}
 
-	return sj, errors.New("no more masters eligible for state.json query")
+	return sj, errors.New("No more masters eligible for state.json query")
 }
 
 // Loads state.json from mesos master
@@ -285,15 +285,15 @@ func (rg *RecordGenerator) loadWrap(ip, port string) (state.State, error) {
 		return state.State{}, err
 	}
 	if sj.Leader != "" {
-		var rip string
+		var stateLeaderIP string
 
-		rip, err = leaderIP(sj.Leader)
+		stateLeaderIP, err = leaderIP(sj.Leader)
 		if err != nil {
 			return sj, err
 		}
-		if rip != ip {
-			logging.VeryVerbose.Println("Warning: master changed to " + ip)
-			return rg.loadFromMaster(rip, port)
+		if stateLeaderIP != ip {
+			logging.VeryVerbose.Println("Warning: master changed to " + stateLeaderIP)
+			return rg.loadFromMaster(stateLeaderIP, port)
 		}
 		return sj, nil
 	}