Commit52f8607

committed

plumb to executor

1 parent16c3751 commit52f8607Copy full SHA for 52f8607

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1125,7 +1125,7 @@ func (r RootCmd) Server(newAPI func(context.Context, coderd.Options) (*coderd.`
`1125`	`1125`	`autobuildTicker:=time.NewTicker(vals.AutobuildPollInterval.Value())`
`1126`	`1126`	`deferautobuildTicker.Stop()`
`1127`	`1127`	`autobuildExecutor:=autobuild.NewExecutor(`
`1128`		`-ctx,options.Database,options.Pubsub,options.PrometheusRegistry,coderAPI.TemplateScheduleStore,&coderAPI.Auditor,coderAPI.AccessControlStore,logger,autobuildTicker.C,options.NotificationsEnqueuer,coderAPI.Experiments)`
	`1128`	`+ctx,options.Database,options.Pubsub,coderAPI.FileCache,options.PrometheusRegistry,coderAPI.TemplateScheduleStore,&coderAPI.Auditor,coderAPI.AccessControlStore,logger,autobuildTicker.C,options.NotificationsEnqueuer,coderAPI.Experiments)`
`1129`	`1129`	`autobuildExecutor.Run()`
`1130`	`1130`
`1131`	`1131`	`jobReaperTicker:=time.NewTicker(vals.JobReaperDetectorInterval.Value())`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,10 @@ import (`
`33`	`33`
`34`	`34`	`// Executor automatically starts or stops workspaces.`
`35`	`35`	`typeExecutorstruct {`
`36`		`-ctx context.Context`
`37`		`-db database.Store`
`38`		`-ps pubsub.Pubsub`
`39`		`-//fileCache *files.Cache`
	`36`	`+ctxcontext.Context`
	`37`	`+dbdatabase.Store`
	`38`	`+pspubsub.Pubsub`
	`39`	`+fileCache*files.Cache`
`40`	`40`	`templateScheduleStore*atomic.Pointer[schedule.TemplateScheduleStore]`
`41`	`41`	`accessControlStore*atomic.Pointer[dbauthz.AccessControlStore]`
`42`	`42`	`auditor*atomic.Pointer[audit.Auditor]`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ import (`
`52`	`52`	`"cdr.dev/slog"`
`53`	`53`	`"cdr.dev/slog/sloggers/sloghuman"`
`54`	`54`	`"cdr.dev/slog/sloggers/slogtest"`
	`55`	`+"github.com/coder/coder/v2/coderd/files"`
`55`	`56`	`"github.com/coder/quartz"`
`56`	`57`
`57`	`58`	`"github.com/coder/coder/v2/coderd"`
`@@ -359,6 +360,7 @@ func NewOptions(t testing.TB, options *Options) (func(http.Handler), context.Can`
`359`	`360`	`ctx,`
`360`	`361`	`options.Database,`
`361`	`362`	`options.Pubsub,`
	`363`	`+files.NewFromStore(options.Database,prometheus.NewRegistry(),options.Authorizer),`
`362`	`364`	`prometheus.NewRegistry(),`
`363`	`365`	`&templateScheduleStore,`
`364`	`366`	`&auditor,`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1164,7 +1164,7 @@ func (api *API) setupPrebuilds(featureEnabled bool) (agplprebuilds.Reconciliatio`
`1164`	`1164`	`returnagplprebuilds.DefaultReconciler,agplprebuilds.DefaultClaimer`
`1165`	`1165`	`}`
`1166`	`1166`
`1167`		`-reconciler:=prebuilds.NewStoreReconciler(api.Database,api.Pubsub,api.DeploymentValues.Prebuilds,`
	`1167`	`+reconciler:=prebuilds.NewStoreReconciler(api.Database,api.Pubsub,api.AGPL.FileCache,api.DeploymentValues.Prebuilds,`
`1168`	`1168`	`api.Logger.Named("prebuilds"),quartz.NewReal(),api.PrometheusRegistry,api.NotificationsEnqueuer)`
`1169`	`1169`	`returnreconciler,prebuilds.NewEnterpriseClaimer(api.Database)`
`1170`	`1170`	`}`

Comments

(0)