sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add functionality for resending pp events

Browse Source 
Signed-off-by: jkoberg <jkoberg@owncloud.com>
This commit is contained in:
jkoberg
2023-06-13 10:50:07 +02:00
parent 85dcb57cbe
commit 76141a492f
2 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/postprocessing/pkg/service/service.go
+23 -4
View File
@@ -28,6 +28,7 @@ func NewPostprocessingService(stream events.Stream, logger log.Logger, sto store
events.StartPostprocessingStep{},
events.UploadReady{},
events.PostprocessingStepFinished{},
events.ResumePostprocessing{},
)
if err != nil {
return nil, err
@@ -46,10 +47,15 @@ func NewPostprocessingService(stream events.Stream, logger log.Logger, sto store
// Run to fulfil Runner interface
func (pps *PostprocessingService) Run() error {
for e := range pps.events {
var next interface{}
var (
next interface{}
pp *postprocessing.Postprocessing
err error
)
switch ev := e.Event.(type) {
case events.BytesReceived:
pp := postprocessing.New(ev.UploadID, ev.URL, ev.ExecutingUser, ev.Filename, ev.Filesize, ev.ResourceID, pps.steps, pps.c.Delayprocessing)
pp = postprocessing.New(ev.UploadID, ev.URL, ev.ExecutingUser, ev.Filename, ev.Filesize, ev.ResourceID, pps.steps, pps.c.Delayprocessing)
if err := storePP(pps.store, pp); err != nil {
pps.log.Error().Str("uploadID", ev.UploadID).Err(err).Msg("cannot store upload")
continue
@@ -61,7 +67,7 @@ func (pps *PostprocessingService) Run() error {
// no current upload - this was an on demand scan
continue
}
pp, err := getPP(pps.store, ev.UploadID)
pp, err = getPP(pps.store, ev.UploadID)
if err != nil {
pps.log.Error().Str("uploadID", ev.UploadID).Err(err).Msg("cannot get upload")
continue
@@ -71,7 +77,7 @@ func (pps *PostprocessingService) Run() error {
if ev.StepToStart != events.PPStepDelay {
continue
}
pp, err := getPP(pps.store, ev.UploadID)
pp, err = getPP(pps.store, ev.UploadID)
if err != nil {
pps.log.Error().Str("uploadID", ev.UploadID).Err(err).Msg("cannot get upload")
continue
@@ -83,8 +89,21 @@ func (pps *PostprocessingService) Run() error {
pps.log.Error().Str("uploadID", ev.UploadID).Err(err).Msg("cannot delete upload")
continue
}
case events.ResumePostprocessing:
pp, err = getPP(pps.store, ev.UploadID)
if err != nil {
pps.log.Error().Str("uploadID", ev.UploadID).Err(err).Msg("cannot get upload")
continue
}
next = pp.CurrentStep()
}
if pp != nil {
if err := storePP(pps.store, pp); err != nil {
pps.log.Error().Str("uploadID", pp.ID).Err(err).Msg("cannot store upload")
// TODO: should we continue here?
}
}
if next != nil {
if err := events.Publish(pps.pub, next); err != nil {
pps.log.Error().Err(err).Msg("unable to publish event")