devices and providers can now drop mid stream and then reconnect without impact
This commit is contained in:
@@ -405,6 +405,11 @@ func (d *CDashDisplay) UnloadLayout() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (cds *CDashDisplay) resetState() {
|
||||||
|
cds.fieldToWindows = make(map[telemetry.FieldID][]int16)
|
||||||
|
cds.State.Layout = NewLayoutTree()
|
||||||
|
}
|
||||||
|
|
||||||
func (cds *CDashDisplay) reset() error {
|
func (cds *CDashDisplay) reset() error {
|
||||||
err := cds.WT.SendCommand(resetCMDID, []byte{0x01, 0x02, 0x03, 0x04}, nil)
|
err := cds.WT.SendCommand(resetCMDID, []byte{0x01, 0x02, 0x03, 0x04}, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -413,6 +418,8 @@ func (cds *CDashDisplay) reset() error {
|
|||||||
|
|
||||||
time.Sleep(3000 * time.Millisecond)
|
time.Sleep(3000 * time.Millisecond)
|
||||||
|
|
||||||
|
cds.resetState()
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1 +1,6 @@
|
|||||||
package services
|
package services
|
||||||
|
|
||||||
|
func (ds *DeviceService) OnStoppedMidStream() {
|
||||||
|
// Need to make every device be unconfigured
|
||||||
|
ds.StopStream()
|
||||||
|
}
|
||||||
|
|||||||
@@ -228,8 +228,8 @@ func (pss *PeripheralStateStore) OnStopStream() {
|
|||||||
pss.mu.Unlock()
|
pss.mu.Unlock()
|
||||||
|
|
||||||
for _, state := range pss.GetStates() {
|
for _, state := range pss.GetStates() {
|
||||||
if state.State == DeviceIsStreaming {
|
if state.State > DeviceIsConfigured {
|
||||||
pss.setDeviceConfigured(state.device.Name)
|
pss.setDeviceUnconfigured(state.device.Name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ func NewOrchestrator(logger *slog.Logger) (*Orchestrator, error) {
|
|||||||
|
|
||||||
// Setup telemetry service callbacks
|
// Setup telemetry service callbacks
|
||||||
telemService.startedStreaming = devService.StartStream
|
telemService.startedStreaming = devService.StartStream
|
||||||
|
telemService.providerStoppedMidStream = devService.OnStoppedMidStream
|
||||||
|
|
||||||
return &Orchestrator{
|
return &Orchestrator{
|
||||||
DeviceService: devService,
|
DeviceService: devService,
|
||||||
|
|||||||
@@ -35,7 +35,8 @@ type TelemetryService struct {
|
|||||||
CtxHealthcheck context.Context
|
CtxHealthcheck context.Context
|
||||||
healthCheckCancel context.CancelFunc
|
healthCheckCancel context.CancelFunc
|
||||||
// Callbacks
|
// Callbacks
|
||||||
startedStreaming func(ch <-chan telemetry.TelemetryData)
|
startedStreaming func(ch <-chan telemetry.TelemetryData)
|
||||||
|
providerStoppedMidStream func()
|
||||||
// Devices data request
|
// Devices data request
|
||||||
// peripheralProvider func() []peripheral.Peripheral
|
// peripheralProvider func() []peripheral.Peripheral
|
||||||
// getRequiredFields func() []telemetry.FieldID
|
// getRequiredFields func() []telemetry.FieldID
|
||||||
@@ -139,6 +140,7 @@ func (t *TelemetryService) dropActiveProvider() {
|
|||||||
t.cancelForward()
|
t.cancelForward()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NOTE: can we move the stop stream into the provider Close() method?
|
||||||
t.activeProvider.StopStream()
|
t.activeProvider.StopStream()
|
||||||
t.activeProvider.Close()
|
t.activeProvider.Close()
|
||||||
t.activeProvider = nil
|
t.activeProvider = nil
|
||||||
|
|||||||
@@ -30,6 +30,8 @@ func (t *TelemetryService) onFindProvider(prov telem.TelemetryProvider) {
|
|||||||
|
|
||||||
ch := t.StartStream()
|
ch := t.StartStream()
|
||||||
t.startedStreaming(ch)
|
t.startedStreaming(ch)
|
||||||
|
|
||||||
|
t.Messages <- "provider switch completed"
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *TelemetryService) onProviderStopsMidStream() {
|
func (t *TelemetryService) onProviderStopsMidStream() {
|
||||||
@@ -38,6 +40,10 @@ func (t *TelemetryService) onProviderStopsMidStream() {
|
|||||||
// if the stream stopped we have to restart the devices and everything
|
// if the stream stopped we have to restart the devices and everything
|
||||||
t.Messages <- "Telemetry provider stopped mid stream\n"
|
t.Messages <- "Telemetry provider stopped mid stream\n"
|
||||||
t.logger.Info("cleaning dropped provider and restarting lookup service")
|
t.logger.Info("cleaning dropped provider and restarting lookup service")
|
||||||
|
|
||||||
t.dropActiveProvider()
|
t.dropActiveProvider()
|
||||||
go t.FindProvider(t.CtxMonitor)
|
go t.FindProvider(t.CtxMonitor)
|
||||||
|
|
||||||
|
// Tell the devices service that we lost the thing
|
||||||
|
t.providerStoppedMidStream()
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user