From c8fad20f493d52215d4d8f2a6fd3dead67fd8890 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Tue, 28 Mar 2023 23:51:38 +0800
Subject: [PATCH] handle possible panic (#88)

Reviewed-on: https://gitea.com/gitea/act_runner/pulls/88
Reviewed-by: Jason Song <i@wolfogre.com>
---
 poller/poller.go | 61 +++++++++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/poller/poller.go b/poller/poller.go
index 007809f..7e39f03 100644
--- a/poller/poller.go
+++ b/poller/poller.go
@@ -57,6 +57,40 @@ func (p *Poller) Wait() {
 	p.routineGroup.Wait()
 }
 
+func (p *Poller) handle(ctx context.Context, l *log.Entry) {
+	defer func() {
+		if r := recover(); r != nil {
+			l.Errorf("handle task panic: %+v", r)
+		}
+	}()
+
+	for {
+		select {
+		case <-ctx.Done():
+			return
+		default:
+			task, err := p.pollTask(ctx)
+			if task == nil || err != nil {
+				if err != nil {
+					l.Errorf("can't find the task: %v", err.Error())
+				}
+				time.Sleep(5 * time.Second)
+				break
+			}
+
+			p.metric.IncBusyWorker()
+			p.routineGroup.Run(func() {
+				defer p.schedule()
+				defer p.metric.DecBusyWorker()
+				if err := p.dispatchTask(ctx, task); err != nil {
+					l.Errorf("execute task: %v", err.Error())
+				}
+			})
+			return
+		}
+	}
+}
+
 func (p *Poller) Poll(ctx context.Context) error {
 	l := log.WithField("func", "Poll")
 
@@ -70,32 +104,7 @@ func (p *Poller) Poll(ctx context.Context) error {
 		case <-ctx.Done():
 			return nil
 		}
-	LOOP:
-		for {
-			select {
-			case <-ctx.Done():
-				break LOOP
-			default:
-				task, err := p.pollTask(ctx)
-				if task == nil || err != nil {
-					if err != nil {
-						l.Errorf("can't find the task: %v", err.Error())
-					}
-					time.Sleep(5 * time.Second)
-					break
-				}
-
-				p.metric.IncBusyWorker()
-				p.routineGroup.Run(func() {
-					defer p.schedule()
-					defer p.metric.DecBusyWorker()
-					if err := p.dispatchTask(ctx, task); err != nil {
-						l.Errorf("execute task: %v", err.Error())
-					}
-				})
-				break LOOP
-			}
-		}
+		p.handle(ctx, l)
 	}
 }