fix: cancel job contexts in create/update errors (#858)

JohnRoesler · web-flow · commit fcfcb87056b4 · 2025-07-21T12:28:36.000-05:00
diff --git a/go.mod b/go.mod
@@ -8,6 +8,7 @@ require (
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/stretchr/testify v1.10.0
 	go.uber.org/goleak v1.3.0
+	golang.org/x/crypto v0.40.0
 )
 
 require (
diff --git a/go.sum b/go.sum
@@ -19,6 +19,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
+golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
diff --git a/scheduler.go b/scheduler.go
@@ -736,16 +736,19 @@ func (s *scheduler) addOrUpdateJob(id uuid.UUID, definition JobDefinition, taskW
 	}
 
 	if err := s.verifyParameterType(taskFunc, tsk); err != nil {
+		j.cancel()
 		return nil, err
 	}
 
 	if err := definition.setup(&j, s.location, s.exec.clock.Now()); err != nil {
+		j.cancel()
 		return nil, err
 	}
 
 	newJobCtx, newJobCancel := context.WithCancel(context.Background())
 	select {
 	case <-s.shutdownCtx.Done():
+		newJobCancel()
 	case s.newJobCh <- newJobIn{
 		ctx:    newJobCtx,
 		cancel: newJobCancel,
@@ -756,6 +759,7 @@ func (s *scheduler) addOrUpdateJob(id uuid.UUID, definition JobDefinition, taskW
 	select {
 	case <-newJobCtx.Done():
 	case <-s.shutdownCtx.Done():
+		newJobCancel()
 	}
 
 	out := s.jobFromInternalJob(j)

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ require (`
`8`	`8`	`github.com/robfig/cron/v3 v3.0.1`
`9`	`9`	`github.com/stretchr/testify v1.10.0`
`10`	`10`	`go.uber.org/goleak v1.3.0`
	`11`	`+ golang.org/x/crypto v0.40.0`
`11`	`12`	`)`
`12`	`13`
`13`	`14`	`require (`
Original file line number	Diff line number	Diff line change
`@@ -736,16 +736,19 @@ func (s *scheduler) addOrUpdateJob(id uuid.UUID, definition JobDefinition, taskW`
`736`	`736`	`}`
`737`	`737`
`738`	`738`	`if err := s.verifyParameterType(taskFunc, tsk); err != nil {`
	`739`	`+ j.cancel()`
`739`	`740`	`return nil, err`
`740`	`741`	`}`
`741`	`742`
`742`	`743`	`if err := definition.setup(&j, s.location, s.exec.clock.Now()); err != nil {`
	`744`	`+ j.cancel()`
`743`	`745`	`return nil, err`
`744`	`746`	`}`
`745`	`747`
`746`	`748`	`newJobCtx, newJobCancel := context.WithCancel(context.Background())`
`747`	`749`	`select {`
`748`	`750`	`case <-s.shutdownCtx.Done():`
	`751`	`+ newJobCancel()`
`749`	`752`	`case s.newJobCh <- newJobIn{`
`750`	`753`	`ctx: newJobCtx,`
`751`	`754`	`cancel: newJobCancel,`
`@@ -756,6 +759,7 @@ func (s *scheduler) addOrUpdateJob(id uuid.UUID, definition JobDefinition, taskW`
`756`	`759`	`select {`
`757`	`760`	`case <-newJobCtx.Done():`
`758`	`761`	`case <-s.shutdownCtx.Done():`
	`762`	`+ newJobCancel()`
`759`	`763`	`}`
`760`	`764`
`761`	`765`	`out := s.jobFromInternalJob(j)`