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

worker: Improve logging

Browse source 
Use logrus library for logging
Use appropriate log-level for different log statements
This commit is contained in:
Diaa Sami 2021-10-01 10:48:33 +02:00 • committed by Sanne Raymaekers
parent f9fbf5bd5e
commit 22f151df68
4 changed files with 30 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

9
internal/worker/server.go
View file

@ -16,6 +16,7 @@ import (
"github.com/google/uuid"
"github.com/labstack/echo/v4"
"github.com/sirupsen/logrus"
"github.com/osbuild/osbuild-composer/internal/common"
"github.com/osbuild/osbuild-composer/internal/jobqueue"
@ -52,7 +53,7 @@ func NewServer(logger *log.Logger, jobs jobqueue.JobQueue, artifactsDir string)
func (s *Server) Handler() http.Handler {
e := echo.New()
e.Binder = binder{}
e.StdLogger = s.logger
e.Logger = common.Logger()
// log errors returned from handlers
e.HTTPErrorHandler = api.HTTPErrorHandler
@ -73,10 +74,10 @@ func (s *Server) WatchHeartbeats() {
for range time.Tick(time.Second * 30) {
for _, token := range s.jobs.Heartbeats(time.Second * 120) {
id, _ := s.jobs.IdFromToken(token)
log.Printf("Removing unresponsive job: %s\n", id)
logrus.Infof("Removing unresponsive job: %s\n", id)
err := s.FinishJob(token, nil)
if err != nil {
log.Printf("Error finishing unresponsive job: %v", err)
logrus.Errorf("Error finishing unresponsive job: %v", err)
}
}
}
@ -271,7 +272,7 @@ func (s *Server) FinishJob(token uuid.UUID, result json.RawMessage) error {
if s.artifactsDir != "" {
err := os.Rename(path.Join(s.artifactsDir, "tmp", token.String()), path.Join(s.artifactsDir, jobId.String()))
if err != nil {
log.Printf("Error moving artifacts for job%s: %v", jobId, err)
logrus.Errorf("Error moving artifacts for job %s: %v", jobId, err)
}
}