fix: wait for provisioner daemon jobs to finish after sigterm (#14466)

ethanndickson · web-flow · commit c597c9260d56 · 2024-08-28T20:16:15.000+10:00
diff --git a/enterprise/cli/provisionerdaemonstart.go b/enterprise/cli/provisionerdaemonstart.go
@@ -262,7 +262,7 @@ func (r *RootCmd) provisionerDaemonStart() *serpent.Command {
 				cliui.Errorf(inv.Stderr, "Unexpected error, shutting down server: %s\n", exitErr)
 			}
 
-			err = srv.Shutdown(ctx, waitForProvisionerJobs)
+			err = srv.Shutdown(ctx, !waitForProvisionerJobs)
 			if err != nil {
 				return xerrors.Errorf("shutdown: %w", err)
 			}

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ func (r RootCmd) provisionerDaemonStart() serpent.Command {`
`262`	`262`	`cliui.Errorf(inv.Stderr, "Unexpected error, shutting down server: %s\n", exitErr)`
`263`	`263`	`}`
`264`	`264`
`265`		`- err = srv.Shutdown(ctx, waitForProvisionerJobs)`
	`265`	`+ err = srv.Shutdown(ctx, !waitForProvisionerJobs)`
`266`	`266`	`if err != nil {`
`267`	`267`	`return xerrors.Errorf("shutdown: %w", err)`
`268`	`268`	`}`