fix: range over channel, add continue to default switch case

johnstcn · johnstcn · commit cc1c466cbdaf · 2022-05-09T16:26:51.000Z
diff --git a/coderd/autostart/lifecycle/lifecycle_executor.go b/coderd/autostart/lifecycle/lifecycle_executor.go
@@ -38,15 +38,9 @@ func NewExecutor(ctx context.Context, db database.Store, log slog.Logger, tick <
 // tick from its channel. It will stop when its context is Done, or when
 // its channel is closed.
 func (e *Executor) Run() {
-	for {
-		select {
-		case t := <-e.tick:
-			if err := e.runOnce(t); err != nil {
-				e.log.Error(e.ctx, "error running once", slog.Error(err))
-			}
-		case <-e.ctx.Done():
-			return
-		default:
+	for t := range e.tick {
+		if err := e.runOnce(t); err != nil {
+			e.log.Error(e.ctx, "error running once", slog.Error(err))
 		}
 	}
 }
@@ -94,6 +88,7 @@ func (e *Executor) runOnce(t time.Time) error {
 					slog.F("workspace_id", ws.ID),
 					slog.F("latest_build_transition", latestBuild.Transition),
 				)
+				continue
 			}
 
 			// Round time to the nearest minute, as this is the finest granularity cron supports.

Original file line number	Diff line number	Diff line change
`@@ -38,15 +38,9 @@ func NewExecutor(ctx context.Context, db database.Store, log slog.Logger, tick <`
`38`	`38`	`// tick from its channel. It will stop when its context is Done, or when`
`39`	`39`	`// its channel is closed.`
`40`	`40`	`func (e *Executor) Run() {`
`41`		`- for {`
`42`		`- select {`
`43`		`- case t := <-e.tick:`
`44`		`- if err := e.runOnce(t); err != nil {`
`45`		`- e.log.Error(e.ctx, "error running once", slog.Error(err))`
`46`		`- }`
`47`		`- case <-e.ctx.Done():`
`48`		`- return`
`49`		`- default:`
	`41`	`+ for t := range e.tick {`
	`42`	`+ if err := e.runOnce(t); err != nil {`
	`43`	`+ e.log.Error(e.ctx, "error running once", slog.Error(err))`
`50`	`44`	`}`
`51`	`45`	`}`
`52`	`46`	`}`
`@@ -94,6 +88,7 @@ func (e *Executor) runOnce(t time.Time) error {`
`94`	`88`	`slog.F("workspace_id", ws.ID),`
`95`	`89`	`slog.F("latest_build_transition", latestBuild.Transition),`
`96`	`90`	`)`
	`91`	`+ continue`
`97`	`92`	`}`
`98`	`93`
`99`	`94`	`// Round time to the nearest minute, as this is the finest granularity cron supports.`