internal/app/poll/poller.go

@@ -6,7 +6,6 @@ package poll
 import (
 	"context"
 	"errors"
-	"fmt"
 	"sync"
 
 	runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
@@ -46,30 +45,19 @@ func (p *Poller) Poll(ctx context.Context) {
 func (p *Poller) poll(ctx context.Context, wg *sync.WaitGroup, limiter *rate.Limiter) {
 	defer wg.Done()
 	for {
-		p.pollTaskWithRateLimit(ctx, limiter)
+		if err := limiter.Wait(ctx); err != nil {
-	}
+			if ctx.Err() != nil {
-}
+				log.WithError(err).Debug("limiter wait failed")
-
+			}
-func (p *Poller) pollTaskWithRateLimit(ctx context.Context, limiter *rate.Limiter) {
+			return
-	defer func() {
-		if r := recover(); r != nil {
-			err := fmt.Errorf("panic: %v", r)
-			log.WithError(err).Error("panic in pollTaskWithRateLimit")
 		}
-	}()
+		task, ok := p.fetchTask(ctx)
-
+		if !ok {
-	if err := limiter.Wait(ctx); err != nil {
+			continue
-		if ctx.Err() != nil {
+		}
-			log.WithError(err).Debug("limiter wait failed")
+		if err := p.runner.Run(ctx, task); err != nil {
+			log.WithError(err).Error("failed to run task")
 		}
-		return
-	}
-	task, ok := p.fetchTask(ctx)
-	if !ok {
-		return
-	}
-	if err := p.runner.Run(ctx, task); err != nil {
-		log.WithError(err).Error("failed to run task")
 	}
 }