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

worker: generalize job types in the server

Browse source 
The worker server was heavily tied to OSBuildJob(Result). Untie it so
that it can deal with different job types in the future.

This necessitates a change in the jobqueue: Dequeue() now returns the
job type, as well as job arguments as json.RawMessage. This is so that
the server can wait on multiple job types with different argument
types.

The weldr, composer, and koji APIs continue to use only "osbuild" jobs.
This commit is contained in:
Lars Karlitski 2020-11-02 21:49:18 +01:00
parent 6b6cd7ca9f
commit 59e73a686a
9 changed files with 108 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

15
internal/kojiapi/server.go
View file

@ -227,7 +227,7 @@ func splitExtension(filename string) string {
return "." + strings.Join(filenameParts[1:], ".")
}
func composeStatusFromJobStatus(js *worker.JobStatus) string {
func composeStatusFromJobStatus(js *worker.JobStatus, result *worker.OSBuildJobResult) string {
if js.Canceled {
return "failure"
}
@ -240,14 +240,14 @@ func composeStatusFromJobStatus(js *worker.JobStatus) string {
return "pending"
}
if js.Result.Success {
if result.Success {
return "success"
}
return "failure"
}
func imageStatusFromJobStatus(js *worker.JobStatus) string {
func imageStatusFromJobStatus(js *worker.JobStatus, result *worker.OSBuildJobResult) string {
if js.Canceled {
return "failure"
}
@ -260,7 +260,7 @@ func imageStatusFromJobStatus(js *worker.JobStatus) string {
return "building"
}
if js.Result.Success {
if result.Success {
return "success"
}
@ -274,16 +274,17 @@ func (h *apiHandlers) GetComposeId(ctx echo.Context, idstr string) error {
return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid format for parameter id: %s", err))
}
status, err := h.server.workers.JobStatus(id)
var result worker.OSBuildJobResult
status, err := h.server.workers.JobStatus(id, &result)
if err != nil {
return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Job %s not found: %s", idstr, err))
}
response := api.ComposeStatus{
Status: composeStatusFromJobStatus(status),
Status: composeStatusFromJobStatus(status, &result),
ImageStatuses: []api.ImageStatus{
{
Status: imageStatusFromJobStatus(status),
Status: imageStatusFromJobStatus(status, &result),
},
},
}