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

osbuild-worker: Log unexpected dnf-json errors

Browse source 
These errors result in a 5xx status for the depsolve job, marked as
internal failure, it's useful to log them.
This commit is contained in:
Sanne Raymaekers 2022-03-17 12:16:55 +01:00
parent 9ca74694a7
commit 815d0ad65b
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cmd/osbuild-worker/jobimpl-depsolve.go
View file

@ -3,6 +3,8 @@ package main
import (
"fmt"
"github.com/sirupsen/logrus"
"github.com/osbuild/osbuild-composer/internal/rpmmd"
"github.com/osbuild/osbuild-composer/internal/worker"
"github.com/osbuild/osbuild-composer/internal/worker/clienterrors"
@ -36,6 +38,7 @@ func (impl *DepsolveJobImpl) depsolve(packageSets map[string]rpmmd.PackageSet, r
}
func (impl *DepsolveJobImpl) Run(job worker.Job) error {
logWithId := logrus.WithField("jobId", job.Id())
var args worker.DepsolveJob
err := job.Args(&args)
if err != nil {
@ -57,10 +60,12 @@ func (impl *DepsolveJobImpl) Run(job worker.Job) error {
// This still has the kind/reason format but a kind that's returned
// by dnf-json and not explicitly handled here.
result.JobError = clienterrors.WorkerClientError(clienterrors.ErrorDNFOtherError, err.Error())
logWithId.Errorf("Unhandled dnf-json error in depsolve job: %v", err)
}
case error:
// Error originates from internal/rpmmd, not from dnf-json
result.JobError = clienterrors.WorkerClientError(clienterrors.ErrorRPMMDError, err.Error())
logWithId.Errorf("rpmmd error in depsolve job: %v", err)
}
}