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

worker/api: send job id to worker after all

Browse source 
Full circle. After switching the worker to not operate on jobs directly,
send the id anyway, so that workers can print it in their logs.
This commit is contained in:
Lars Karlitski 2020-09-08 20:49:17 +02:00 • committed by Tom Gundersen
parent b03e1254e9
commit 3bedd25087
6 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
internal/worker/server.go
View file

@ -169,19 +169,19 @@ func (s *Server) DeleteArtifacts(id uuid.UUID) error {
return os.RemoveAll(path.Join(s.artifactsDir, id.String()))
}
func (s *Server) RequestJob(ctx context.Context) (uuid.UUID, *OSBuildJob, error) {
func (s *Server) RequestJob(ctx context.Context) (uuid.UUID, uuid.UUID, *OSBuildJob, error) {
token := uuid.New()
var args OSBuildJob
jobId, err := s.jobs.Dequeue(ctx, []string{"osbuild"}, &args)
if err != nil {
return uuid.Nil, nil, err
return uuid.Nil, uuid.Nil, nil, err
}
if s.artifactsDir != "" {
err := os.MkdirAll(path.Join(s.artifactsDir, "tmp", token.String()), 0700)
if err != nil {
return uuid.Nil, nil, fmt.Errorf("cannot create artifact directory: %v", err)
return uuid.Nil, uuid.Nil, nil, fmt.Errorf("cannot create artifact directory: %v", err)
}
}
@ -189,7 +189,7 @@ func (s *Server) RequestJob(ctx context.Context) (uuid.UUID, *OSBuildJob, error)
defer s.runningMutex.Unlock()
s.running[token] = jobId
return token, &args, nil
return token, jobId, &args, nil
}
func (s *Server) RunningJob(token uuid.UUID) (uuid.UUID, error) {
@ -255,12 +255,13 @@ func (h *apiHandlers) RequestJob(ctx echo.Context) error {
return err
}
token, jobArgs, err := h.server.RequestJob(ctx.Request().Context())
token, jobId, jobArgs, err := h.server.RequestJob(ctx.Request().Context())
if err != nil {
return err
}
return ctx.JSON(http.StatusCreated, requestJobResponse{
Id: jobId,
Manifest: jobArgs.Manifest,
Targets: jobArgs.Targets,
Location: fmt.Sprintf("/jobs/%v", token),