Merge pull request #592 from cj123/live-timings-loop-reconnect

fix live timings disconnect on event loop

CHANGELOG.md

@@ -23,6 +23,7 @@ Fixes:
 * Fixes an issue where cars with no skins might prevent a race from starting.
 * Fixes an issue where Scheduled Championship Race Weekend sessions caused the calendar to error on load.
 * Fixes the Race Weekend "Start after previous session" checkbox not displaying correctly.
+* Fixes an issue where all drivers were incorrectly disconnected from the Live Timings page when an event with multiple sessions looped
 
 ---
 

championship_manager_test.go

@@ -59,7 +59,9 @@ var TestEntryList = EntryList{
 	},
 }
 
-type dummyServerProcess struct{}
+type dummyServerProcess struct {
+	doneCh chan struct{}
+}
 
 func (dummyServerProcess) Logs() string {
 	return ""
@@ -69,7 +71,10 @@ func (dummyServerProcess) Start(cfg ServerConfig, entryList EntryList, forwardin
 	return nil
 }
 
-func (dummyServerProcess) Stop() error {
+func (d dummyServerProcess) Stop() error {
+	if d.doneCh != nil {
+		d.doneCh <- struct{}{}
+	}
 	return nil
 }
 
@@ -92,8 +97,8 @@ func (dummyServerProcess) SendUDPMessage(message udp.Message) error {
 	return nil
 }
 
-func (dummyServerProcess) Done() <-chan struct{} {
-	return nil
+func (d dummyServerProcess) Done() <-chan struct{} {
+	return d.doneCh
 }
 
 func (dummyServerProcess) GetServerConfig() ServerConfig {

race_control.go

@@ -216,27 +216,15 @@ func (rc *RaceControl) OnNewSession(sessionInfo udp.SessionInfo) error {
 	rc.driverGUIDUpdateCounter = make(map[udp.DriverGUID]int)
 	rc.driverGUIDUpdateCounterMutex.Unlock()
 
-	deleteCars := true
-	emptyCarInfo := false
-
-	if sessionInfo.CurrentSessionIndex != 0 && oldSessionInfo.Track == sessionInfo.Track && oldSessionInfo.TrackConfig == sessionInfo.TrackConfig {
-		// only remove cars on the first session (avoid deleting between practice/qualify/race)
-		deleteCars = false
-		emptyCarInfo = true
-	}
+	emptyCarInfo := true
 
 	if (rc.ConnectedDrivers.Len() > 0 || rc.DisconnectedDrivers.Len() > 0) && sessionInfo.Type == udp.SessionTypePractice {
 		if oldSessionInfo.Type == sessionInfo.Type && oldSessionInfo.Track == sessionInfo.Track && oldSessionInfo.TrackConfig == sessionInfo.TrackConfig && oldSessionInfo.Name == sessionInfo.Name {
-			// this is a looped practice event, keep the cars
-			deleteCars = false
+			// this is a looped event, keep the cars
 			emptyCarInfo = false
 		}
 	}
 
-	if deleteCars {
-		rc.clearAllDrivers()
-	}
-
 	if emptyCarInfo {
 		_ = rc.ConnectedDrivers.Each(func(driverGUID udp.DriverGUID, driver *RaceControlDriver) error {
 			*driver = *NewRaceControlDriver(driver.CarInfo)
@@ -274,7 +262,7 @@ func (rc *RaceControl) OnNewSession(sessionInfo udp.SessionInfo) error {
 		rc.TrackMapData = *trackMapData
 	}
 
-	logrus.Debugf("New session detected: %s at %s (%s) [deleteCars: %t, emptyCarInfo: %t]", sessionInfo.Type.String(), sessionInfo.Track, sessionInfo.TrackConfig, deleteCars, emptyCarInfo)
+	logrus.Debugf("New session detected: %s at %s (%s) [emptyCarInfo: %t]", sessionInfo.Type.String(), sessionInfo.Track, sessionInfo.TrackConfig, emptyCarInfo)
 
 	go rc.requestSessionInfo()
 

race_control_test.go

@@ -655,7 +655,8 @@ func TestRaceControl_OnNewSession(t *testing.T) {
 	})
 
 	t.Run("Two separate event progressions", func(t *testing.T) {
-		raceControl := NewRaceControl(NilBroadcaster{}, nilTrackData{}, dummyServerProcess{})
+		process := dummyServerProcess{doneCh: make(chan struct{})}
+		raceControl := NewRaceControl(NilBroadcaster{}, nilTrackData{}, process)
 
 		if err := raceControl.OnVersion(udp.Version(4)); err != nil {
 			t.Error(err)
@@ -745,6 +746,8 @@ func TestRaceControl_OnNewSession(t *testing.T) {
 			return
 		}
 
+		process.Stop()
+
 		// now go to the next session, lap times should be removed from all drivers, but all should still be connected.
 		err = raceControl.OnNewSession(udp.SessionInfo{
 			Version:             4,
@@ -773,7 +776,7 @@ func TestRaceControl_OnNewSession(t *testing.T) {
 		}
 
 		if raceControl.ConnectedDrivers.Len() != 0 || raceControl.DisconnectedDrivers.Len() != 0 {
-			t.Error("Invalid driver list lengths. Expected 0 drivers to still be in driver lists.")
+			t.Errorf("Invalid driver list lengths. Expected 0 drivers to still be in driver lists. (%d conn, %d disconn)", raceControl.ConnectedDrivers.Len(), raceControl.DisconnectedDrivers.Len())
 			return
 		}
 	})