Skip to content

Commit 0059de5

Browse files
brandonddereknola
authored andcommitted
Fix logrus.Error(err) formatting
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
1 parent 3cdac8b commit 0059de5

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

backend/daemon.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func getListener(addr string) (net.Listener, error) {
6969
func (s *CriDockerService) Start() error {
7070
// Start the internal service.
7171
if err := s.service.Start(); err != nil {
72-
logrus.Error(err, "Unable to start cri-dockerd service")
72+
logrus.Errorf("Unable to start cri-dockerd service: %v", err)
7373
return err
7474
}
7575

@@ -93,7 +93,7 @@ func (s *CriDockerService) Start() error {
9393

9494
go func() {
9595
if err := s.server.Serve(l); err != nil {
96-
logrus.Error(err, "Failed to serve connections from cri-dockerd")
96+
logrus.Errorf("Failed to serve connections from cri-dockerd: %v", err)
9797
os.Exit(1)
9898
}
9999
}()

core/imagefs_linux.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func (ds *dockerService) imageFsInfo() (*runtimeapi.ImageFsInfoResponse, error)
3535
stat := &syscall.Statfs_t{}
3636
err := syscall.Statfs(ds.dockerRootDir, stat)
3737
if err != nil {
38-
logrus.Error(err, "Failed to get filesystem info for %s", ds.dockerRootDir)
38+
logrus.Errorf("Failed to get filesystem info for %s: %v", ds.dockerRootDir, err)
3939
return nil, err
4040
}
4141
usedBytes := (stat.Blocks - stat.Bfree) * uint64(stat.Bsize)
@@ -45,7 +45,7 @@ func (ds *dockerService) imageFsInfo() (*runtimeapi.ImageFsInfoResponse, error)
4545
// compute total used bytes by docker images
4646
images, err := ds.client.ListImages(image.ListOptions{All: true, SharedSize: true})
4747
if err != nil {
48-
logrus.Error(err, "Failed to get image list from docker")
48+
logrus.Errorf("Failed to get image list from docker: %v", err)
4949
return nil, err
5050
}
5151
var totalImageSize uint64

0 commit comments

Comments
 (0)