mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

frontend: only pass runner to MakeFrontend, add Runner.GetSubmitQueue()

Browse source
This commit is contained in:
Florian Klink 2019-11-25 17:35:11 +01:00
parent fecbf8b3e2
commit 40b2f11543
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frontend/frontend.go
View file

@ -42,9 +42,11 @@ func loadTemplate(templateName string, funcMap template.FuncMap) (*template.Temp
} }
// MakeFrontend configures the router and returns a new Frontend struct // MakeFrontend configures the router and returns a new Frontend struct
func MakeFrontend(runner *submitqueue.Runner, submitQueue *submitqueue.SubmitQueue) *Frontend { func MakeFrontend(runner *submitqueue.Runner) *Frontend {
router := gin.Default() router := gin.Default()
submitQueue := runner.GetSubmitQueue()
funcMap := template.FuncMap{ funcMap := template.FuncMap{
"isAutoSubmittable": func(serie *submitqueue.Serie) bool { "isAutoSubmittable": func(serie *submitqueue.Serie) bool {
return submitQueue.IsAutoSubmittable(serie) return submitQueue.IsAutoSubmittable(serie)

2
main.go
View file

@ -91,7 +91,7 @@ func main() {
submitQueue := submitqueue.MakeSubmitQueue(gerritClient, projectName, branchName, submitQueueTag) submitQueue := submitqueue.MakeSubmitQueue(gerritClient, projectName, branchName, submitQueueTag)
runner := submitqueue.NewRunner(submitQueue) runner := submitqueue.NewRunner(submitQueue)
handler := frontend.MakeFrontend(runner, submitQueue) handler := frontend.MakeFrontend(runner)
// fetch only on first run // fetch only on first run
runner.Trigger(true) runner.Trigger(true)

5
submitqueue/runner.go
View file

@ -28,6 +28,11 @@ func (r *Runner) GetResults() (*time.Time, []*Result) {
return r.currentlyRunning, r.results return r.currentlyRunning, r.results
} }
// GetSubmitQueue returns the submit queue object, to be consumed by the frontend
func (r *Runner) GetSubmitQueue() (*SubmitQueue) {
return r.SubmitQueue
}
// Trigger starts a new batch job // Trigger starts a new batch job
// TODO: make sure only one batch job is started at the same time // TODO: make sure only one batch job is started at the same time
// if a batch job is already started, ignore the newest request // if a batch job is already started, ignore the newest request