Exit at top level

Dov Alperin · Dov Alperin · commit 28df150f7dda · 2023-04-13T15:31:08.000-04:00
diff --git a/cmd/start/main.go b/cmd/start/main.go
@@ -51,7 +51,8 @@ func main() {
 	svisor := supervisor.New("flypg", 5*time.Minute)
 
 	go func() {
-		if err := scaleToZeroWorker(ctx, node, svisor); err != nil {
+		if err := scaleToZeroWorker(ctx, node); err != nil {
+			svisor.Stop()
 			os.Exit(0)
 		}
 	}()
@@ -96,7 +97,7 @@ func main() {
 	}
 }
 
-func scaleToZeroWorker(ctx context.Context, node *flypg.Node, svisor *supervisor.Supervisor) error {
+func scaleToZeroWorker(ctx context.Context, node *flypg.Node) error {
 	rawTimeout, exists := os.LookupEnv("FLY_SCALE_TO_ZERO")
 	if !exists {
 		return nil
@@ -126,7 +127,6 @@ func scaleToZeroWorker(ctx context.Context, node *flypg.Node, svisor *supervisor
 			if current > 1 {
 				continue
 			}
-			svisor.Stop()
 			return errors.New("scale to zero condition hit")
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,8 @@ func main() {`
`51`	`51`	`svisor := supervisor.New("flypg", 5*time.Minute)`
`52`	`52`
`53`	`53`	`go func() {`
`54`		`- if err := scaleToZeroWorker(ctx, node, svisor); err != nil {`
	`54`	`+ if err := scaleToZeroWorker(ctx, node); err != nil {`
	`55`	`+ svisor.Stop()`
`55`	`56`	`os.Exit(0)`
`56`	`57`	`}`
`57`	`58`	`}()`
`@@ -96,7 +97,7 @@ func main() {`
`96`	`97`	`}`
`97`	`98`	`}`
`98`	`99`
`99`		`-func scaleToZeroWorker(ctx context.Context, node flypg.Node, svisor supervisor.Supervisor) error {`
	`100`	`+func scaleToZeroWorker(ctx context.Context, node *flypg.Node) error {`
`100`	`101`	`rawTimeout, exists := os.LookupEnv("FLY_SCALE_TO_ZERO")`
`101`	`102`	`if !exists {`
`102`	`103`	`return nil`
`@@ -126,7 +127,6 @@ func scaleToZeroWorker(ctx context.Context, node flypg.Node, svisor supervisor`
`126`	`127`	`if current > 1 {`
`127`	`128`	`continue`
`128`	`129`	`}`
`129`		`- svisor.Stop()`
`130`	`130`	`return errors.New("scale to zero condition hit")`
`131`	`131`	`}`
`132`	`132`	`}`