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

worker: standardize logging in OCI target

Browse source 
The OCI target used `log`, instead of `logWithId` for logging messages.
Modify the code to be consistent with other targets.
This commit is contained in:
Tomas Hozza 2022-05-10 14:35:07 +02:00 • committed by Tom Gundersen
parent 8e0db1a4e3
commit 804d4210df
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cmd/osbuild-worker/jobimpl-osbuild.go
View file

@ -5,7 +5,6 @@ import (
"crypto/rand" "crypto/rand"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"log"
"math" "math"
"math/big" "math/big"
"os" "os"
@ -701,8 +700,8 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error {
osbuildJobResult.JobError = clienterrors.WorkerClientError(clienterrors.ErrorInvalidConfig, err.Error()) osbuildJobResult.JobError = clienterrors.WorkerClientError(clienterrors.ErrorInvalidConfig, err.Error())
return nil return nil
} }
log.Print("[OCI] 🔑 Logged in OCI") logWithId.Info("[OCI] 🔑 Logged in OCI")
log.Print("[OCI] ⬆ Uploading the image") logWithId.Info("[OCI] ⬆ Uploading the image")
file, err := os.Open(path.Join(outputDirectory, exportPath, options.FileName)) file, err := os.Open(path.Join(outputDirectory, exportPath, options.FileName))
if err != nil { if err != nil {
osbuildJobResult.JobError = clienterrors.WorkerClientError(clienterrors.ErrorInvalidConfig, err.Error()) osbuildJobResult.JobError = clienterrors.WorkerClientError(clienterrors.ErrorInvalidConfig, err.Error())
@ -722,7 +721,7 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error {
osbuildJobResult.JobError = clienterrors.WorkerClientError(clienterrors.ErrorInvalidConfig, err.Error()) osbuildJobResult.JobError = clienterrors.WorkerClientError(clienterrors.ErrorInvalidConfig, err.Error())
return nil return nil
} }
log.Print("[OCI] 🎉 Image uploaded and registered!") logWithId.Info("[OCI] 🎉 Image uploaded and registered!")
osbuildJobResult.TargetResults = append( osbuildJobResult.TargetResults = append(
osbuildJobResult.TargetResults, osbuildJobResult.TargetResults,