gitea
/
act_runner
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 21 Wiki Activity

Catch the panic and print the error (#305) 

refactor # 215  Catch the panic and print the error
close #215

Co-authored-by: CaiCandong <1290147055@qq.com>
Reviewed-on: https://gitea.com/gitea/act_runner/pulls/305
Co-authored-by: caicandong <caicandong@noreply.gitea.com>
Co-committed-by: caicandong <caicandong@noreply.gitea.com>
This commit is contained in:
caicandong 2023-07-24 04:28:44 +00:00 committed by Jason Song
parent 1a7ec5f339
commit a1bb3b56fd
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
internal/app/poll/poller.go
View File

@ -6,6 +6,7 @@ package poll
import ( import (
"context" "context"
"errors" "errors"
"fmt"
"sync" "sync"
runnerv1 "code.gitea.io/actions-proto-go/runner/v1" runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
@ -45,19 +46,30 @@ func (p *Poller) Poll(ctx context.Context) {
func (p *Poller) poll(ctx context.Context, wg *sync.WaitGroup, limiter *rate.Limiter) { func (p *Poller) poll(ctx context.Context, wg *sync.WaitGroup, limiter *rate.Limiter) {
defer wg.Done() defer wg.Done()
for { for {
if err := limiter.Wait(ctx); err != nil { p.pollTaskWithRateLimit(ctx, limiter)
if ctx.Err() != nil { }
log.WithError(err).Debug("limiter wait failed") }
}
return func (p *Poller) pollTaskWithRateLimit(ctx context.Context, limiter *rate.Limiter) {
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 {
continue if err := limiter.Wait(ctx); err != nil {
} if ctx.Err() != nil {
if err := p.runner.Run(ctx, task); err != nil { log.WithError(err).Debug("limiter wait failed")
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")
} }
} }