tvolkmann/gyrogpsc
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases 1 Wiki Activity

Merge branch 'develop' into frank-dev2

Browse Source
This commit is contained in:
unknown 2021-01-08 23:59:52 +01:00
commit c2a3fe5732
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/pipeline_replay.go
View File

@ -63,8 +63,11 @@ func (p *pipelineReplay) channelFromTracking(t *Tracking) chan interface{} {
i++ i++
} }
} }
logrus.Infoln("replay: tracking replay finished") logrus.Infoln("replay: tracking replay finished")
select {
case <-p.stopChan:
logrus.Debugln("replay pipeline closed")
}
}() }()
return ch return ch
} }

7
core/service.go
View File

@ -140,6 +140,7 @@ func (t *TrackingService) StartLivetracking(cols ...CollectorType) (string, erro
// finally create pipeline // finally create pipeline
NewRecordPipeline(t.publisher, t, tcp, ser) NewRecordPipeline(t.publisher, t, tcp, ser)
t.publisher.SetStreaming(true) t.publisher.SetStreaming(true)
logrus.Debugln("current State:", t.opMode)
return "LIVE", nil return "LIVE", nil
} }
@ -148,6 +149,7 @@ func (t *TrackingService) StartLivetracking(cols ...CollectorType) (string, erro
func (t *TrackingService) AllTrackings() ([]TrackingMetadata, error) { func (t *TrackingService) AllTrackings() ([]TrackingMetadata, error) {
logrus.Info("SERVICE: GET ALL TRACKINGS") logrus.Info("SERVICE: GET ALL TRACKINGS")
data, err := t.store.LoadAll() data, err := t.store.LoadAll()
logrus.Debugln("current State:", t.opMode)
return data, err return data, err
} }
@ -168,6 +170,7 @@ func (t *TrackingService) StartRecord() (string, error) {
t.opMode = RECORDING t.opMode = RECORDING
t.tracking.TimeCreated = time.Now() t.tracking.TimeCreated = time.Now()
t.SetRecording(true) t.SetRecording(true)
logrus.Debugln("current State:", t.opMode)
return "record started at: " + t.tracking.TimeCreated.String(), nil return "record started at: " + t.tracking.TimeCreated.String(), nil
} }
@ -191,6 +194,7 @@ func (t *TrackingService) StopRecord() (*TrackingMetadata, error) {
tm := t.tracking.TrackingMetadata tm := t.tracking.TrackingMetadata
t.safelyReplaceTracking(newTracking()) t.safelyReplaceTracking(newTracking())
t.tracking.Collectors = tm.Collectors t.tracking.Collectors = tm.Collectors
logrus.Debugln("current State:", t.opMode)
return &tm, err return &tm, err
} }
@ -214,12 +218,14 @@ func (t *TrackingService) StopAll() (*TrackingMetadata, error) {
tm, err = t.StopRecord() tm, err = t.StopRecord()
} }
t.opMode = STOPPED t.opMode = STOPPED
logrus.Debugln("current State:", t.opMode)
return tm, err return tm, err
} }
// retrieves tracking with all data and starts replay pipeline if desired. // retrieves tracking with all data and starts replay pipeline if desired.
// in that case the application behaves like in live mode. // in that case the application behaves like in live mode.
func (t *TrackingService) LoadTracking(trackingId uuid.UUID, replay bool) (*Tracking, error) { func (t *TrackingService) LoadTracking(trackingId uuid.UUID, replay bool) (*Tracking, error) {
logrus.Info("SERVICE: LOAD TRACKING")
if t.opMode == RECORDING { if t.opMode == RECORDING {
txt := "trackingservice: please stop recording before load another tracking" txt := "trackingservice: please stop recording before load another tracking"
logrus.Warn(txt) logrus.Warn(txt)
@ -245,6 +251,7 @@ func (t *TrackingService) LoadTracking(trackingId uuid.UUID, replay bool) (*Trac
t.replaypipe = NewReplayPipeline(t.publisher, t.tracking) t.replaypipe = NewReplayPipeline(t.publisher, t.tracking)
t.publisher.SetStreaming(true) t.publisher.SetStreaming(true)
t.opMode = REPLAY t.opMode = REPLAY
logrus.Debugln("current State:", t.opMode)
return t.tracking, nil return t.tracking, nil
} }