From 8b6b54cab38e354af7e92fc12254e8c46531867f Mon Sep 17 00:00:00 2001
From: reugn <reugpro@gmail.com>
Date: Fri, 19 Apr 2024 18:26:32 +0300
Subject: [PATCH] fix(scheduler): recover from unhandled job panics

---
 quartz/scheduler.go      |  7 +++++++
 quartz/scheduler_test.go | 26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/quartz/scheduler.go b/quartz/scheduler.go
index acc1391..886dde7 100644
--- a/quartz/scheduler.go
+++ b/quartz/scheduler.go
@@ -493,6 +493,13 @@ func (sched *StdScheduler) executeAndReschedule(ctx context.Context) {
 }
 
 func executeWithRetries(ctx context.Context, jobDetail *JobDetail) {
+	// recover from unhandled panics that may occur during job execution
+	defer func() {
+		if err := recover(); err != nil {
+			logger.Errorf("Job %s panicked: %s", jobDetail.jobKey, err)
+		}
+	}()
+
 	err := jobDetail.job.Execute(ctx)
 	if err == nil {
 		return
diff --git a/quartz/scheduler_test.go b/quartz/scheduler_test.go
index efa4df6..04dc809 100644
--- a/quartz/scheduler_test.go
+++ b/quartz/scheduler_test.go
@@ -408,6 +408,32 @@ func TestScheduler_MisfiredJob(t *testing.T) {
 	sched.Stop()
 }
 
+func TestScheduler_JobPanic(t *testing.T) {
+	ctx, cancel := context.WithTimeout(context.Background(), 35*time.Millisecond)
+	defer cancel()
+
+	var n int32
+	addJob := job.NewFunctionJob(func(_ context.Context) (int32, error) {
+		return atomic.AddInt32(&n, 1), nil
+	})
+	panicJob := job.NewFunctionJob(func(_ context.Context) (int32, error) {
+		panic("error")
+	})
+
+	sched := quartz.NewStdScheduler()
+	sched.Start(ctx)
+
+	addJobDetail := quartz.NewJobDetail(addJob, quartz.NewJobKey("addJob"))
+	err := sched.ScheduleJob(addJobDetail, quartz.NewSimpleTrigger(10*time.Millisecond))
+	assert.IsNil(t, err)
+	panicJobDetail := quartz.NewJobDetail(panicJob, quartz.NewJobKey("panicJob"))
+	err = sched.ScheduleJob(panicJobDetail, quartz.NewSimpleTrigger(15*time.Millisecond))
+	assert.IsNil(t, err)
+
+	sched.Wait(ctx)
+	assert.Equal(t, int(atomic.LoadInt32(&n)), 3)
+}
+
 func TestScheduler_PauseResume(t *testing.T) {
 	var n int32
 	funcJob := job.NewFunctionJob(func(_ context.Context) (string, error) {