From 815d0ad65b1151aa6268561fb62d028fbc63342c Mon Sep 17 00:00:00 2001 From: Sanne Raymaekers Date: Thu, 17 Mar 2022 12:16:55 +0100 Subject: [PATCH] osbuild-worker: Log unexpected dnf-json errors These errors result in a 5xx status for the depsolve job, marked as internal failure, it's useful to log them. --- cmd/osbuild-worker/jobimpl-depsolve.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmd/osbuild-worker/jobimpl-depsolve.go b/cmd/osbuild-worker/jobimpl-depsolve.go index f5cdce415..04056ed88 100644 --- a/cmd/osbuild-worker/jobimpl-depsolve.go +++ b/cmd/osbuild-worker/jobimpl-depsolve.go @@ -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) } }