particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

api/weldr: propagate the ComposeResult to ComposeStatus

Browse source 
When a job doesn't exist for a compose, just return an empty result.
In the future this will cause logs disappear from jobs created before the
store-jobqueue split but we decided we can live with that, they are still
in /var for those who really want them.
This commit is contained in:
Ondřej Budai 2020-05-15 12:02:22 +02:00 • committed by Lars Karlitski
parent 78d5109c81
commit 3b6bc69c37
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/weldr/api.go
View file

@ -147,6 +147,7 @@ type composeStatus struct {
Queued time.Time Queued time.Time
Started time.Time Started time.Time
Finished time.Time Finished time.Time
Result *common.ComposeResult
} }
// Returns the state of the image in `compose` and the times the job was // Returns the state of the image in `compose` and the times the job was
@ -175,6 +176,7 @@ func (api *API) getComposeStatus(compose store.Compose) *composeStatus {
Queued: compose.ImageBuild.JobCreated, Queued: compose.ImageBuild.JobCreated,
Started: compose.ImageBuild.JobStarted, Started: compose.ImageBuild.JobStarted,
Finished: compose.ImageBuild.JobFinished, Finished: compose.ImageBuild.JobFinished,
Result: &common.ComposeResult{},
} }
} }
@ -185,6 +187,7 @@ func (api *API) getComposeStatus(compose store.Compose) *composeStatus {
Queued: jobStatus.Queued, Queued: jobStatus.Queued,
Started: jobStatus.Started, Started: jobStatus.Started,
Finished: jobStatus.Finished, Finished: jobStatus.Finished,
Result: jobStatus.Result.OSBuildOutput,
} }
} }