kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

daemon/images: ImageService.Cleanup(): return error instead of logging

Browse source 
This makes the function a bit more idiomatic, and leaves it to the caller to
decide wether or not the error can be ignored.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-01-21 20:25:01 +01:00
parent 32e5fe5099
commit 79cad59d97
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/daemon.go
View file

@ -1206,7 +1206,9 @@ func (daemon *Daemon) Shutdown() error {
} }
if daemon.imageService != nil { if daemon.imageService != nil {
daemon.imageService.Cleanup() if err := daemon.imageService.Cleanup(); err != nil {
logrus.Error(err)
}
} }
// If we are part of a cluster, clean up cluster's stuff // If we are part of a cluster, clean up cluster's stuff

6
daemon/images/service.go
View file

@ -20,7 +20,6 @@ import (
"github.com/docker/libtrust" "github.com/docker/libtrust"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus"
"golang.org/x/sync/singleflight" "golang.org/x/sync/singleflight"
) )
@ -167,10 +166,11 @@ func (i *ImageService) GetLayerMountID(cid string) (string, error) {
// Cleanup resources before the process is shutdown. // Cleanup resources before the process is shutdown.
// called from daemon.go Daemon.Shutdown() // called from daemon.go Daemon.Shutdown()
func (i *ImageService) Cleanup() { func (i *ImageService) Cleanup() error {
if err := i.layerStore.Cleanup(); err != nil { if err := i.layerStore.Cleanup(); err != nil {
logrus.Errorf("Error during layer Store.Cleanup(): %v", err) return errors.Wrap(err, "error during layerStore.Cleanup()")
} }
return nil
} }
// GraphDriverName returns the name of the graph drvier // GraphDriverName returns the name of the graph drvier