From fa710e504b0e3e51d4031790c18621b02dcd2600 Mon Sep 17 00:00:00 2001 From: Daehyeok Mun Date: Mon, 31 Oct 2016 22:05:01 -0600 Subject: [PATCH] Fix logrus formatting This fix tries to fix logrus formatting by removing `f` from `logrus.[Error|Warn|Debug|Fatal|Panic|Info]f` when formatting string is not present. Fixed issue #23459 Signed-off-by: Daehyeok Mun --- daemon/cluster/cluster.go | 2 +- daemon/daemon.go | 2 +- daemon/daemon_unix.go | 2 +- daemon/graphdriver/aufs/aufs.go | 2 +- daemon/graphdriver/devmapper/deviceset.go | 12 ++++++------ daemon/graphdriver/overlay2/overlay.go | 2 +- pkg/discovery/kv/kv.go | 4 ++-- plugin/backend.go | 2 +- plugin/distribution/pull.go | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/daemon/cluster/cluster.go b/daemon/cluster/cluster.go index 646446cf8e..8a51fd07fb 100644 --- a/daemon/cluster/cluster.go +++ b/daemon/cluster/cluster.go @@ -169,7 +169,7 @@ func New(config Config) (*Cluster, error) { select { case <-time.After(swarmConnectTimeout): - logrus.Errorf("swarm component could not be started before timeout was reached") + logrus.Error("swarm component could not be started before timeout was reached") case <-n.Ready(): case <-n.done: return nil, fmt.Errorf("swarm component could not be started: %v", c.err) diff --git a/daemon/daemon.go b/daemon/daemon.go index 9be801e8cb..97c81a5e9f 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -190,7 +190,7 @@ func (daemon *Daemon) restore() error { go func(c *container.Container) { defer wg.Done() if err := backportMountSpec(c); err != nil { - logrus.Errorf("Failed to migrate old mounts to use new spec format") + logrus.Error("Failed to migrate old mounts to use new spec format") } if c.IsRunning() || c.IsPaused() { diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index 95e6a20b36..2fcaa00ede 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -636,7 +636,7 @@ func (daemon *Daemon) initNetworkController(config *Config, activeSandboxes map[ } if len(activeSandboxes) > 0 { - logrus.Infof("There are old running containers, the network config will not take affect") + logrus.Info("There are old running containers, the network config will not take affect") return controller, nil } diff --git a/daemon/graphdriver/aufs/aufs.go b/daemon/graphdriver/aufs/aufs.go index c59cac019e..e33cef91e3 100644 --- a/daemon/graphdriver/aufs/aufs.go +++ b/daemon/graphdriver/aufs/aufs.go @@ -344,7 +344,7 @@ func (a *Driver) Remove(id string) error { tmpMntPath := path.Join(a.mntPath(), fmt.Sprintf("%s-removing", id)) if err := os.Rename(mountpoint, tmpMntPath); err != nil && !os.IsNotExist(err) { if err == syscall.EBUSY { - logrus.Warnf("os.Rename err due to EBUSY") + logrus.Warn("os.Rename err due to EBUSY") out, debugErr := debugEBusy(mountpoint) if debugErr == nil { logrus.Warnf("debugEBusy returned %v", out) diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go index a7ac29ed58..b8e762592c 100644 --- a/daemon/graphdriver/devmapper/deviceset.go +++ b/daemon/graphdriver/devmapper/deviceset.go @@ -410,8 +410,8 @@ func (devices *DeviceSet) lookupDeviceWithLock(hash string) (*devInfo, error) { // This function relies on that device hash map has been loaded in advance. // Should be called with devices.Lock() held. func (devices *DeviceSet) constructDeviceIDMap() { - logrus.Debugf("devmapper: constructDeviceIDMap()") - defer logrus.Debugf("devmapper: constructDeviceIDMap() END") + logrus.Debug("devmapper: constructDeviceIDMap()") + defer logrus.Debug("devmapper: constructDeviceIDMap() END") for _, info := range devices.Devices { devices.markDeviceIDUsed(info.DeviceID) @@ -459,8 +459,8 @@ func (devices *DeviceSet) deviceFileWalkFunction(path string, finfo os.FileInfo) } func (devices *DeviceSet) loadDeviceFilesOnStart() error { - logrus.Debugf("devmapper: loadDeviceFilesOnStart()") - defer logrus.Debugf("devmapper: loadDeviceFilesOnStart() END") + logrus.Debug("devmapper: loadDeviceFilesOnStart()") + defer logrus.Debug("devmapper: loadDeviceFilesOnStart() END") var scan = func(path string, info os.FileInfo, err error) error { if err != nil { @@ -1713,9 +1713,9 @@ func (devices *DeviceSet) initDevmapper(doInit bool) error { // https://github.com/docker/docker/issues/4036 if supported := devicemapper.UdevSetSyncSupport(true); !supported { if dockerversion.IAmStatic == "true" { - logrus.Errorf("devmapper: Udev sync is not supported. This will lead to data loss and unexpected behavior. Install a dynamic binary to use devicemapper or select a different storage driver. For more information, see https://docs.docker.com/engine/reference/commandline/daemon/#daemon-storage-driver-option") + logrus.Error("devmapper: Udev sync is not supported. This will lead to data loss and unexpected behavior. Install a dynamic binary to use devicemapper or select a different storage driver. For more information, see https://docs.docker.com/engine/reference/commandline/daemon/#daemon-storage-driver-option") } else { - logrus.Errorf("devmapper: Udev sync is not supported. This will lead to data loss and unexpected behavior. Install a more recent version of libdevmapper or select a different storage driver. For more information, see https://docs.docker.com/engine/reference/commandline/daemon/#daemon-storage-driver-option") + logrus.Error("devmapper: Udev sync is not supported. This will lead to data loss and unexpected behavior. Install a more recent version of libdevmapper or select a different storage driver. For more information, see https://docs.docker.com/engine/reference/commandline/daemon/#daemon-storage-driver-option") } if !devices.overrideUdevSyncCheck { diff --git a/daemon/graphdriver/overlay2/overlay.go b/daemon/graphdriver/overlay2/overlay.go index 7d3c7b3ab8..1943fe66c8 100644 --- a/daemon/graphdriver/overlay2/overlay.go +++ b/daemon/graphdriver/overlay2/overlay.go @@ -125,7 +125,7 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap if !opts.overrideKernelCheck { return nil, graphdriver.ErrNotSupported } - logrus.Warnf("Using pre-4.0.0 kernel for overlay2, mount failures may require kernel update") + logrus.Warn("Using pre-4.0.0 kernel for overlay2, mount failures may require kernel update") } fsMagic, err := graphdriver.GetFSMagic(home) diff --git a/pkg/discovery/kv/kv.go b/pkg/discovery/kv/kv.go index 2e0f69dcea..77eee7d454 100644 --- a/pkg/discovery/kv/kv.go +++ b/pkg/discovery/kv/kv.go @@ -73,7 +73,7 @@ func (s *Discovery) Initialize(uris string, heartbeat time.Duration, ttl time.Du var config *store.Config if clusterOpts["kv.cacertfile"] != "" && clusterOpts["kv.certfile"] != "" && clusterOpts["kv.keyfile"] != "" { - logrus.Infof("Initializing discovery with TLS") + logrus.Info("Initializing discovery with TLS") tlsConfig, err := tlsconfig.Client(tlsconfig.Options{ CAFile: clusterOpts["kv.cacertfile"], CertFile: clusterOpts["kv.certfile"], @@ -93,7 +93,7 @@ func (s *Discovery) Initialize(uris string, heartbeat time.Duration, ttl time.Du TLS: tlsConfig, } } else { - logrus.Infof("Initializing discovery without TLS") + logrus.Info("Initializing discovery without TLS") } // Creates a new store, will ignore options given diff --git a/plugin/backend.go b/plugin/backend.go index 26f8938b35..dd1bc6679f 100644 --- a/plugin/backend.go +++ b/plugin/backend.go @@ -62,7 +62,7 @@ func (pm *Manager) Pull(name string, metaHeader http.Header, authConfig *types.A name = ref.String() if p, _ := pm.pluginStore.GetByName(name); p != nil { - logrus.Debugf("plugin already exists") + logrus.Debug("plugin already exists") return nil, fmt.Errorf("%s exists", name) } diff --git a/plugin/distribution/pull.go b/plugin/distribution/pull.go index 71566a3d2b..1635672cfc 100644 --- a/plugin/distribution/pull.go +++ b/plugin/distribution/pull.go @@ -113,7 +113,7 @@ func Pull(ref reference.Named, rs registry.Service, metaheader http.Header, auth return nil, err } if !confirmedV2 { - logrus.Debugf("pull.go: !confirmedV2") + logrus.Debug("pull.go: !confirmedV2") return nil, ErrUnsupportedRegistry } logrus.Debugf("Trying to pull %s from %s %s", repoInfo.Name(), endpoint.URL, endpoint.Version)