Cleanup: remove some unused code & add some comments

This commit is contained in:
Sybren A. Stüvel 2022-02-14 14:47:54 +01:00
parent 22f2084e89
commit 8af041fe44
2 changed files with 3 additions and 13 deletions

View File

@ -22,7 +22,6 @@ package worker
import ( import (
"context" "context"
"errors"
"net/http" "net/http"
"time" "time"
@ -36,11 +35,6 @@ const (
durationFetchFailed = 10 * time.Second // ... if fetching failed somehow. durationFetchFailed = 10 * time.Second // ... if fetching failed somehow.
) )
var (
errUnknownTaskRequestStatus = errors.New("unknown task request status")
errReregistrationRequired = errors.New("re-registration is required")
)
func (w *Worker) gotoStateAwake(ctx context.Context) { func (w *Worker) gotoStateAwake(ctx context.Context) {
w.stateMutex.Lock() w.stateMutex.Lock()
defer w.stateMutex.Unlock() defer w.stateMutex.Unlock()
@ -52,6 +46,7 @@ func (w *Worker) gotoStateAwake(ctx context.Context) {
go w.runStateAwake(ctx) go w.runStateAwake(ctx)
} }
// runStateAwake fetches a task and executes it, in an endless loop.
func (w *Worker) runStateAwake(ctx context.Context) { func (w *Worker) runStateAwake(ctx context.Context) {
defer w.doneWg.Done() defer w.doneWg.Done()
@ -61,12 +56,12 @@ func (w *Worker) runStateAwake(ctx context.Context) {
return return
} }
// The task runner's listener will be responsible for sending results back
// to the Manager. This code only needs to fetch a task and run it.
err := w.taskRunner.Run(ctx, *task) err := w.taskRunner.Run(ctx, *task)
if err != nil { if err != nil {
log.Warn().Err(err).Interface("task", *task).Msg("error executing task") log.Warn().Err(err).Interface("task", *task).Msg("error executing task")
} }
// TODO: send the result of the execution back to the Manager.
} }
} }

View File

@ -2,17 +2,12 @@ package worker
import ( import (
"context" "context"
"errors"
"sync" "sync"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"gitlab.com/blender/flamenco-ng-poc/pkg/api" "gitlab.com/blender/flamenco-ng-poc/pkg/api"
) )
var (
errRequestAborted = errors.New("request to Manager aborted")
)
// Worker performs regular Flamenco Worker operations. // Worker performs regular Flamenco Worker operations.
type Worker struct { type Worker struct {
doneChan chan struct{} doneChan chan struct{}