standardize logrus messages to upper case

Remove ERROR: Error stutter from logrus messages also.

[ NO TESTS NEEDED] This is just code cleanup.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

1 files changed, 29 insertions, 29 deletions

diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 9ac2cd5bd..cb691dfd8 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -176,7 +176,7 @@ func (c *Container) waitForExitFileAndSync() error {
 		c.state.State = define.ContainerStateStopped
 
 		if err2 := c.save(); err2 != nil {
-			logrus.Errorf("Error saving container %s state: %v", c.ID(), err2)
+			logrus.Errorf("Saving container %s state: %v", c.ID(), err2)
 		}
 
 		return err
@@ -278,7 +278,7 @@ func (c *Container) handleRestartPolicy(ctx context.Context) (_ bool, retErr err
 	defer func() {
 		if retErr != nil {
 			if err := c.cleanup(ctx); err != nil {
-				logrus.Errorf("error cleaning up container %s: %v", c.ID(), err)
+				logrus.Errorf("Cleaning up container %s: %v", c.ID(), err)
 			}
 		}
 	}()
@@ -709,7 +709,7 @@ func (c *Container) export(path string) error {
 		mountPoint = containerMount
 		defer func() {
 			if _, err := c.runtime.store.Unmount(c.ID(), false); err != nil {
-				logrus.Errorf("error unmounting container %q: %v", c.ID(), err)
+				logrus.Errorf("Unmounting container %q: %v", c.ID(), err)
 			}
 		}()
 	}
@@ -778,7 +778,7 @@ func (c *Container) prepareToStart(ctx context.Context, recursive bool) (retErr
 	defer func() {
 		if retErr != nil {
 			if err := c.cleanup(ctx); err != nil {
-				logrus.Errorf("error cleaning up container %s: %v", c.ID(), err)
+				logrus.Errorf("Cleaning up container %s: %v", c.ID(), err)
 			}
 		}
 	}()
@@ -859,7 +859,7 @@ func (c *Container) startDependencies(ctx context.Context) error {
 	}
 
 	if len(ctrErrors) > 0 {
-		logrus.Errorf("error starting some container dependencies")
+		logrus.Errorf("Starting some container dependencies")
 		for _, e := range ctrErrors {
 			logrus.Errorf("%q", e)
 		}
@@ -1047,7 +1047,7 @@ func (c *Container) init(ctx context.Context, retainRetries bool) error {
 		// upstream in any OCI runtime.
 		// TODO: Remove once runc supports cgroupsv2
 		if strings.Contains(err.Error(), "this version of runc doesn't work on cgroups v2") {
-			logrus.Errorf("oci runtime %q does not support CGroups V2: use system migrate to mitigate", c.ociRuntime.Name())
+			logrus.Errorf("Oci runtime %q does not support CGroups V2: use system migrate to mitigate", c.ociRuntime.Name())
 		}
 		return err
 	}
@@ -1057,7 +1057,7 @@ func (c *Container) init(ctx context.Context, retainRetries bool) error {
 	// Remove any exec sessions leftover from a potential prior run.
 	if len(c.state.ExecSessions) > 0 {
 		if err := c.runtime.state.RemoveContainerExecSessions(c); err != nil {
-			logrus.Errorf("Error removing container %s exec sessions from DB: %v", c.ID(), err)
+			logrus.Errorf("Removing container %s exec sessions from DB: %v", c.ID(), err)
 		}
 		c.state.ExecSessions = make(map[string]*ExecSession)
 	}
@@ -1164,7 +1164,7 @@ func (c *Container) initAndStart(ctx context.Context) (retErr error) {
 	defer func() {
 		if retErr != nil {
 			if err := c.cleanup(ctx); err != nil {
-				logrus.Errorf("error cleaning up container %s: %v", c.ID(), err)
+				logrus.Errorf("Cleaning up container %s: %v", c.ID(), err)
 			}
 		}
 	}()
@@ -1211,7 +1211,7 @@ func (c *Container) start() error {
 			payload += daemon.SdNotifyReady
 		}
 		if sent, err := daemon.SdNotify(false, payload); err != nil {
-			logrus.Errorf("Error notifying systemd of Conmon PID: %s", err.Error())
+			logrus.Errorf("Notifying systemd of Conmon PID: %s", err.Error())
 		} else if sent {
 			logrus.Debugf("Notify sent successfully")
 		}
@@ -1290,7 +1290,7 @@ func (c *Container) stop(timeout uint) error {
 				return stopErr
 			default:
 				if stopErr != nil {
-					logrus.Errorf("Error syncing container %s status: %v", c.ID(), err)
+					logrus.Errorf("Syncing container %s status: %v", c.ID(), err)
 					return stopErr
 				}
 				return err
@@ -1328,7 +1328,7 @@ func (c *Container) stop(timeout uint) error {
 		c.state.FinishedTime = time.Now()
 		c.state.State = define.ContainerStateStopped
 		if err := c.save(); err != nil {
-			logrus.Errorf("Error saving container %s status: %v", c.ID(), err)
+			logrus.Errorf("Saving container %s status: %v", c.ID(), err)
 		}
 
 		return errors.Wrapf(define.ErrConmonDead, "container %s conmon process missing, cannot retrieve exit code", c.ID())
@@ -1432,7 +1432,7 @@ func (c *Container) restartWithTimeout(ctx context.Context, timeout uint) (retEr
 	defer func() {
 		if retErr != nil {
 			if err := c.cleanup(ctx); err != nil {
-				logrus.Errorf("error cleaning up container %s: %v", c.ID(), err)
+				logrus.Errorf("Cleaning up container %s: %v", c.ID(), err)
 			}
 		}
 	}()
@@ -1483,7 +1483,7 @@ func (c *Container) mountStorage() (_ string, deferredErr error) {
 		defer func() {
 			if deferredErr != nil {
 				if err := c.unmountSHM(c.config.ShmDir); err != nil {
-					logrus.Errorf("Error unmounting SHM for container %s after mount error: %v", c.ID(), err)
+					logrus.Errorf("Unmounting SHM for container %s after mount error: %v", c.ID(), err)
 				}
 			}
 		}()
@@ -1526,7 +1526,7 @@ func (c *Container) mountStorage() (_ string, deferredErr error) {
 		defer func() {
 			if deferredErr != nil {
 				if err := c.unmount(false); err != nil {
-					logrus.Errorf("Error unmounting container %s after mount error: %v", c.ID(), err)
+					logrus.Errorf("Unmounting container %s after mount error: %v", c.ID(), err)
 				}
 			}
 		}()
@@ -1554,7 +1554,7 @@ func (c *Container) mountStorage() (_ string, deferredErr error) {
 			}
 			vol.lock.Lock()
 			if err := vol.unmount(false); err != nil {
-				logrus.Errorf("Error unmounting volume %s after error mounting container %s: %v", vol.Name(), c.ID(), err)
+				logrus.Errorf("Unmounting volume %s after error mounting container %s: %v", vol.Name(), c.ID(), err)
 			}
 			vol.lock.Unlock()
 		}()
@@ -1669,7 +1669,7 @@ func (c *Container) mountNamedVolume(v *ContainerNamedVolume, mountpoint string)
 		if err := copier.Put(volMount, "", copyOpts, reader); err != nil {
 			err2 := <-errChan
 			if err2 != nil {
-				logrus.Errorf("Error streaming contents of container %s directory for volume copy-up: %v", c.ID(), err2)
+				logrus.Errorf("Streaming contents of container %s directory for volume copy-up: %v", c.ID(), err2)
 			}
 			return nil, errors.Wrapf(err, "error copying up to volume %s", vol.Name())
 		}
@@ -1705,7 +1705,7 @@ func (c *Container) cleanupStorage() error {
 	for _, containerMount := range c.config.Mounts {
 		if err := c.unmountSHM(containerMount); err != nil {
 			if cleanupErr != nil {
-				logrus.Errorf("Error unmounting container %s: %v", c.ID(), cleanupErr)
+				logrus.Errorf("Unmounting container %s: %v", c.ID(), cleanupErr)
 			}
 			cleanupErr = err
 		}
@@ -1730,7 +1730,7 @@ func (c *Container) cleanupStorage() error {
 			logrus.Errorf("Storage for container %s has been removed", c.ID())
 		} else {
 			if cleanupErr != nil {
-				logrus.Errorf("Error cleaning up container %s storage: %v", c.ID(), cleanupErr)
+				logrus.Errorf("Cleaning up container %s storage: %v", c.ID(), cleanupErr)
 			}
 			cleanupErr = err
 		}
@@ -1741,7 +1741,7 @@ func (c *Container) cleanupStorage() error {
 		vol, err := c.runtime.state.Volume(v.Name)
 		if err != nil {
 			if cleanupErr != nil {
-				logrus.Errorf("Error unmounting container %s: %v", c.ID(), cleanupErr)
+				logrus.Errorf("Unmounting container %s: %v", c.ID(), cleanupErr)
 			}
 			cleanupErr = errors.Wrapf(err, "error retrieving named volume %s for container %s", v.Name, c.ID())
 
@@ -1754,7 +1754,7 @@ func (c *Container) cleanupStorage() error {
 			vol.lock.Lock()
 			if err := vol.unmount(false); err != nil {
 				if cleanupErr != nil {
-					logrus.Errorf("Error unmounting container %s: %v", c.ID(), cleanupErr)
+					logrus.Errorf("Unmounting container %s: %v", c.ID(), cleanupErr)
 				}
 				cleanupErr = errors.Wrapf(err, "error unmounting volume %s for container %s", vol.Name(), c.ID())
 			}
@@ -1768,7 +1768,7 @@ func (c *Container) cleanupStorage() error {
 	if c.valid {
 		if err := c.save(); err != nil {
 			if cleanupErr != nil {
-				logrus.Errorf("Error unmounting container %s: %v", c.ID(), cleanupErr)
+				logrus.Errorf("Unmounting container %s: %v", c.ID(), cleanupErr)
 			}
 			cleanupErr = err
 		}
@@ -1785,7 +1785,7 @@ func (c *Container) cleanup(ctx context.Context) error {
 	// Remove healthcheck unit/timer file if it execs
 	if c.config.HealthCheckConfig != nil {
 		if err := c.removeTimer(); err != nil {
-			logrus.Errorf("Error removing timer for container %s healthcheck: %v", c.ID(), err)
+			logrus.Errorf("Removing timer for container %s healthcheck: %v", c.ID(), err)
 		}
 	}
 
@@ -1800,7 +1800,7 @@ func (c *Container) cleanup(ctx context.Context) error {
 	// exists.
 	if err := c.cleanupRuntime(ctx); err != nil {
 		if lastError != nil {
-			logrus.Errorf("Error removing container %s from OCI runtime: %v", c.ID(), err)
+			logrus.Errorf("Removing container %s from OCI runtime: %v", c.ID(), err)
 		} else {
 			lastError = err
 		}
@@ -1809,7 +1809,7 @@ func (c *Container) cleanup(ctx context.Context) error {
 	// Unmount storage
 	if err := c.cleanupStorage(); err != nil {
 		if lastError != nil {
-			logrus.Errorf("Error unmounting container %s storage: %v", c.ID(), err)
+			logrus.Errorf("Unmounting container %s storage: %v", c.ID(), err)
 		} else {
 			lastError = errors.Wrapf(err, "error unmounting container %s storage", c.ID())
 		}
@@ -1823,14 +1823,14 @@ func (c *Container) cleanup(ctx context.Context) error {
 				lastError = err
 				continue
 			}
-			logrus.Errorf("error unmounting image volume %q:%q :%v", v.Source, v.Dest, err)
+			logrus.Errorf("Unmounting image volume %q:%q :%v", v.Source, v.Dest, err)
 		}
 		if err := img.Unmount(false); err != nil {
 			if lastError == nil {
 				lastError = err
 				continue
 			}
-			logrus.Errorf("error unmounting image volume %q:%q :%v", v.Source, v.Dest, err)
+			logrus.Errorf("Unmounting image volume %q:%q :%v", v.Source, v.Dest, err)
 		}
 	}
 
@@ -1874,7 +1874,7 @@ func (c *Container) postDeleteHooks(ctx context.Context) error {
 				var stderr, stdout bytes.Buffer
 				hookErr, err := exec.Run(ctx, &hook, state, &stdout, &stderr, exec.DefaultPostKillTimeout)
 				if err != nil {
-					logrus.Warnf("container %s: poststop hook %d: %v", c.ID(), i, err)
+					logrus.Warnf("Container %s: poststop hook %d: %v", c.ID(), i, err)
 					if hookErr != err {
 						logrus.Debugf("container %s: poststop hook %d (hook error): %v", c.ID(), i, hookErr)
 					}
@@ -2010,7 +2010,7 @@ func (c *Container) setupOCIHooks(ctx context.Context, config *spec.Spec) (map[s
 				return nil, err
 			}
 			if len(ociHooks) > 0 || config.Hooks != nil {
-				logrus.Warnf("implicit hook directories are deprecated; set --ociHooks-dir=%q explicitly to continue to load ociHooks from this directory", hDir)
+				logrus.Warnf("Implicit hook directories are deprecated; set --ociHooks-dir=%q explicitly to continue to load ociHooks from this directory", hDir)
 			}
 			for i, hook := range ociHooks {
 				allHooks[i] = hook
@@ -2030,7 +2030,7 @@ func (c *Container) setupOCIHooks(ctx context.Context, config *spec.Spec) (map[s
 
 	hookErr, err := exec.RuntimeConfigFilter(ctx, allHooks["precreate"], config, exec.DefaultPostKillTimeout)
 	if err != nil {
-		logrus.Warnf("container %s: precreate hook: %v", c.ID(), err)
+		logrus.Warnf("Container %s: precreate hook: %v", c.ID(), err)
 		if hookErr != nil && hookErr != err {
 			logrus.Debugf("container %s: precreate hook (hook error): %v", c.ID(), hookErr)
 		}