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>

34 files changed, 93 insertions, 93 deletions

diff --git a/pkg/api/handlers/compat/containers_start.go b/pkg/api/handlers/compat/containers_start.go
index ca2b5d84c..fb68389bc 100644
--- a/pkg/api/handlers/compat/containers_start.go
+++ b/pkg/api/handlers/compat/containers_start.go
@@ -25,7 +25,7 @@ func StartContainer(w http.ResponseWriter, r *http.Request) {
 	}
 	if len(query.DetachKeys) > 0 {
 		// TODO - start does not support adding detach keys
-		logrus.Info("the detach keys parameter is not supported on start container")
+		logrus.Info("The detach keys parameter is not supported on start container")
 	}
 	runtime := r.Context().Value(api.RuntimeKey).(*libpod.Runtime)
 	name := utils.GetName(r)
diff --git a/pkg/api/handlers/compat/containers_stats.go b/pkg/api/handlers/compat/containers_stats.go
index e872f885a..0051e7235 100644
--- a/pkg/api/handlers/compat/containers_stats.go
+++ b/pkg/api/handlers/compat/containers_stats.go
@@ -227,10 +227,10 @@ func toBlkioStatEntry(entries []cgroups.BlkIOEntry) []docker.BlkioStatEntry {
 	for i, e := range entries {
 		bits, err := json.Marshal(e)
 		if err != nil {
-			logrus.Errorf("unable to marshal blkio stats: %q", err)
+			logrus.Errorf("Unable to marshal blkio stats: %q", err)
 		}
 		if err := json.Unmarshal(bits, &results[i]); err != nil {
-			logrus.Errorf("unable to unmarshal blkio stats: %q", err)
+			logrus.Errorf("Unable to unmarshal blkio stats: %q", err)
 		}
 	}
 	return results
diff --git a/pkg/api/handlers/compat/events.go b/pkg/api/handlers/compat/events.go
index a79b33ecc..901acdac4 100644
--- a/pkg/api/handlers/compat/events.go
+++ b/pkg/api/handlers/compat/events.go
@@ -94,7 +94,7 @@ func GetEvents(w http.ResponseWriter, r *http.Request) {
 			}
 
 			if err := coder.Encode(e); err != nil {
-				logrus.Errorf("unable to write json: %q", err)
+				logrus.Errorf("Unable to write json: %q", err)
 			}
 			flush()
 		case <-r.Context().Done():
diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go
index 9f46ecc52..7bd6d3dbf 100644
--- a/pkg/api/handlers/libpod/pods.go
+++ b/pkg/api/handlers/libpod/pods.go
@@ -186,9 +186,9 @@ func PodStop(w http.ResponseWriter, r *http.Request) {
 	}
 	// Try to clean up the pod - but only warn on failure, it's nonfatal.
 	if cleanupCtrs, cleanupErr := pod.Cleanup(r.Context()); cleanupErr != nil {
-		logrus.Errorf("Error cleaning up pod %s: %v", pod.ID(), cleanupErr)
+		logrus.Errorf("Cleaning up pod %s: %v", pod.ID(), cleanupErr)
 		for id, err := range cleanupCtrs {
-			logrus.Errorf("Error cleaning up pod %s container %s: %v", pod.ID(), id, err)
+			logrus.Errorf("Cleaning up pod %s container %s: %v", pod.ID(), id, err)
 		}
 	}
 
diff --git a/pkg/api/handlers/utils/containers.go b/pkg/api/handlers/utils/containers.go
index 5cdb31de1..6f875fc30 100644
--- a/pkg/api/handlers/utils/containers.go
+++ b/pkg/api/handlers/utils/containers.go
@@ -78,7 +78,7 @@ func WaitContainerDocker(w http.ResponseWriter, r *http.Request) {
 	exitCode, err := waitDockerCondition(ctx, name, interval, condition)
 	var errStruct *struct{ Message string }
 	if err != nil {
-		logrus.Errorf("error while waiting on condition: %q", err)
+		logrus.Errorf("While waiting on condition: %q", err)
 		errStruct = &struct {
 			Message string
 		}{
@@ -94,7 +94,7 @@ func WaitContainerDocker(w http.ResponseWriter, r *http.Request) {
 	enc.SetEscapeHTML(true)
 	err = enc.Encode(&responseData)
 	if err != nil {
-		logrus.Errorf("unable to write json: %q", err)
+		logrus.Errorf("Unable to write json: %q", err)
 	}
 }
 
diff --git a/pkg/api/handlers/utils/handler.go b/pkg/api/handlers/utils/handler.go
index 7625f9546..29139a98e 100644
--- a/pkg/api/handlers/utils/handler.go
+++ b/pkg/api/handlers/utils/handler.go
@@ -89,21 +89,21 @@ func WriteResponse(w http.ResponseWriter, code int, value interface{}) {
 		w.WriteHeader(code)
 
 		if _, err := fmt.Fprintln(w, v); err != nil {
-			logrus.Errorf("unable to send string response: %q", err)
+			logrus.Errorf("Unable to send string response: %q", err)
 		}
 	case *os.File:
 		w.Header().Set("Content-Type", "application/octet; charset=us-ascii")
 		w.WriteHeader(code)
 
 		if _, err := io.Copy(w, v); err != nil {
-			logrus.Errorf("unable to copy to response: %q", err)
+			logrus.Errorf("Unable to copy to response: %q", err)
 		}
 	case io.Reader:
 		w.Header().Set("Content-Type", "application/x-tar")
 		w.WriteHeader(code)
 
 		if _, err := io.Copy(w, v); err != nil {
-			logrus.Errorf("unable to copy to response: %q", err)
+			logrus.Errorf("Unable to copy to response: %q", err)
 		}
 	default:
 		WriteJSON(w, code, value)
@@ -162,7 +162,7 @@ func WriteJSON(w http.ResponseWriter, code int, value interface{}) {
 	coder := json.NewEncoder(w)
 	coder.SetEscapeHTML(true)
 	if err := coder.Encode(value); err != nil {
-		logrus.Errorf("unable to write json: %q", err)
+		logrus.Errorf("Unable to write json: %q", err)
 	}
 }
 
diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go
index 34d0fa246..c7174775e 100644
--- a/pkg/api/server/server.go
+++ b/pkg/api/server/server.go
@@ -233,7 +233,7 @@ func (s *APIServer) Serve() error {
 			s.pprof = &http.Server{Addr: "localhost:8888", Handler: pprofMux}
 			err := s.pprof.ListenAndServe()
 			if err != nil && err != http.ErrServerClosed {
-				logrus.Warn("API profiler service failed: " + err.Error())
+				logrus.Warnf("API profiler service failed: %v", err)
 			}
 		}()
 	}
@@ -272,7 +272,7 @@ func (s *APIServer) Shutdown() error {
 				go func() {
 					defer cancel()
 					if err := s.pprof.Shutdown(ctx); err != nil {
-						logrus.Warn("Failed to cleanly shutdown API pprof service: " + err.Error())
+						logrus.Warnf("Failed to cleanly shutdown API pprof service: %v", err)
 					}
 				}()
 				<-ctx.Done()
diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go
index 6aff880f4..070e222ad 100644
--- a/pkg/auth/auth.go
+++ b/pkg/auth/auth.go
@@ -208,7 +208,7 @@ func RemoveAuthfile(authfile string) {
 		return
 	}
 	if err := os.Remove(authfile); err != nil {
-		logrus.Errorf("Error removing temporary auth file %q: %v", authfile, err)
+		logrus.Errorf("Removing temporary auth file %q: %v", authfile, err)
 	}
 }
 
diff --git a/pkg/bindings/containers/attach.go b/pkg/bindings/containers/attach.go
index 6efbcb57b..abf58aaf9 100644
--- a/pkg/bindings/containers/attach.go
+++ b/pkg/bindings/containers/attach.go
@@ -102,7 +102,7 @@ func Attach(ctx context.Context, nameOrID string, stdin io.Reader, stdout io.Wri
 		}
 		defer func() {
 			if err := terminal.Restore(int(file.Fd()), state); err != nil {
-				logrus.Errorf("unable to restore terminal: %q", err)
+				logrus.Errorf("Unable to restore terminal: %q", err)
 			}
 			logrus.SetFormatter(&logrus.TextFormatter{})
 		}()
@@ -166,7 +166,7 @@ func Attach(ctx context.Context, nameOrID string, stdin io.Reader, stdout io.Wri
 			_, err := utils.CopyDetachable(socket, stdin, detachKeysInBytes)
 
 			if err != nil && err != define.ErrDetach {
-				logrus.Error("failed to write input to service: " + err.Error())
+				logrus.Errorf("Failed to write input to service: %v", err)
 			}
 			stdinChan <- err
 
@@ -349,7 +349,7 @@ func attachHandleResize(ctx, winCtx context.Context, winChange chan os.Signal, i
 	resize := func() {
 		w, h, err := terminal.GetSize(int(file.Fd()))
 		if err != nil {
-			logrus.Warnf("failed to obtain TTY size: %v", err)
+			logrus.Warnf("Failed to obtain TTY size: %v", err)
 		}
 
 		var resizeErr error
@@ -359,7 +359,7 @@ func attachHandleResize(ctx, winCtx context.Context, winChange chan os.Signal, i
 			resizeErr = ResizeContainerTTY(ctx, id, new(ResizeTTYOptions).WithHeight(h).WithWidth(w))
 		}
 		if resizeErr != nil {
-			logrus.Infof("failed to resize TTY: %v", resizeErr)
+			logrus.Infof("Failed to resize TTY: %v", resizeErr)
 		}
 	}
 
@@ -443,13 +443,13 @@ func ExecStartAndAttach(ctx context.Context, sessionID string, options *ExecStar
 		}
 		defer func() {
 			if err := terminal.Restore(int(terminalFile.Fd()), state); err != nil {
-				logrus.Errorf("unable to restore terminal: %q", err)
+				logrus.Errorf("Unable to restore terminal: %q", err)
 			}
 			logrus.SetFormatter(&logrus.TextFormatter{})
 		}()
 		w, h, err := terminal.GetSize(int(terminalFile.Fd()))
 		if err != nil {
-			logrus.Warnf("failed to obtain TTY size: %v", err)
+			logrus.Warnf("Failed to obtain TTY size: %v", err)
 		}
 		body.Width = uint16(w)
 		body.Height = uint16(h)
@@ -502,7 +502,7 @@ func ExecStartAndAttach(ctx context.Context, sessionID string, options *ExecStar
 			logrus.Debugf("Copying STDIN to socket")
 			_, err := utils.CopyDetachable(socket, options.InputStream, []byte{})
 			if err != nil {
-				logrus.Error("failed to write input to service: " + err.Error())
+				logrus.Errorf("Failed to write input to service: %v", err)
 			}
 
 			if closeWrite, ok := socket.(CloseWriter); ok {
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go
index 9d5aad23b..ded97d8d6 100644
--- a/pkg/bindings/images/build.go
+++ b/pkg/bindings/images/build.go
@@ -312,7 +312,7 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
 
 	contextDir, err := filepath.Abs(options.ContextDirectory)
 	if err != nil {
-		logrus.Errorf("cannot find absolute path of %v: %v", options.ContextDirectory, err)
+		logrus.Errorf("Cannot find absolute path of %v: %v", options.ContextDirectory, err)
 		return nil, err
 	}
 
@@ -339,7 +339,7 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
 		}
 		containerfile, err := filepath.Abs(c)
 		if err != nil {
-			logrus.Errorf("cannot find absolute path of %v: %v", c, err)
+			logrus.Errorf("Cannot find absolute path of %v: %v", c, err)
 			return nil, err
 		}
 
@@ -371,7 +371,7 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
 	}
 	tarfile, err := nTar(append(excludes, dontexcludes...), tarContent...)
 	if err != nil {
-		logrus.Errorf("cannot tar container entries %v error: %v", tarContent, err)
+		logrus.Errorf("Cannot tar container entries %v error: %v", tarContent, err)
 		return nil, err
 	}
 	defer func() {
@@ -477,7 +477,7 @@ func nTar(excludes []string, sources ...string) (io.ReadCloser, error) {
 		for _, src := range sources {
 			s, err := filepath.Abs(src)
 			if err != nil {
-				logrus.Errorf("cannot stat one of source context: %v", err)
+				logrus.Errorf("Cannot stat one of source context: %v", err)
 				merr = multierror.Append(merr, err)
 				return
 			}
diff --git a/pkg/checkpoint/checkpoint_restore.go b/pkg/checkpoint/checkpoint_restore.go
index 9fdf04933..f53e31f9b 100644
--- a/pkg/checkpoint/checkpoint_restore.go
+++ b/pkg/checkpoint/checkpoint_restore.go
@@ -51,7 +51,7 @@ func CRImportCheckpoint(ctx context.Context, runtime *libpod.Runtime, restoreOpt
 	}
 	defer func() {
 		if err := os.RemoveAll(dir); err != nil {
-			logrus.Errorf("could not recursively remove %s: %q", dir, err)
+			logrus.Errorf("Could not recursively remove %s: %q", dir, err)
 		}
 	}()
 	err = archive.Untar(archiveFile, dir, options)
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
index affed64d1..02af214a6 100644
--- a/pkg/domain/infra/abi/containers.go
+++ b/pkg/domain/infra/abi/containers.go
@@ -825,7 +825,7 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
 				})
 				if ctr.AutoRemove() {
 					if err := ic.removeContainer(ctx, ctr, entities.RmOptions{}); err != nil {
-						logrus.Errorf("Error removing container %s: %v", ctr.ID(), err)
+						logrus.Errorf("Removing container %s: %v", ctr.ID(), err)
 					}
 				}
 				return reports, errors.Wrapf(err, "unable to start container %s", ctr.ID())
@@ -860,7 +860,7 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
 				reports = append(reports, report)
 				if ctr.AutoRemove() {
 					if err := ic.removeContainer(ctx, ctr, entities.RmOptions{}); err != nil {
-						logrus.Errorf("Error removing container %s: %v", ctr.ID(), err)
+						logrus.Errorf("Removing container %s: %v", ctr.ID(), err)
 					}
 				}
 				continue
@@ -978,7 +978,7 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta
 				errors.Cause(err) == define.ErrCtrRemoved {
 				logrus.Infof("Container %s was already removed, skipping --rm", ctr.ID())
 			} else {
-				logrus.Errorf("Error removing container %s: %v", ctr.ID(), err)
+				logrus.Errorf("Removing container %s: %v", ctr.ID(), err)
 			}
 		}
 	}
diff --git a/pkg/domain/infra/abi/containers_runlabel.go b/pkg/domain/infra/abi/containers_runlabel.go
index 435baa8c8..add82f0fb 100644
--- a/pkg/domain/infra/abi/containers_runlabel.go
+++ b/pkg/domain/infra/abi/containers_runlabel.go
@@ -87,7 +87,7 @@ func (ic *ContainerEngine) ContainerRunlabel(ctx context.Context, label string,
 				ctr, err := ic.Libpod.LookupContainer(name)
 				if err != nil {
 					if errors.Cause(err) != define.ErrNoSuchCtr {
-						logrus.Debugf("Error occurred searching for container %s: %s", name, err.Error())
+						logrus.Debugf("Error occurred searching for container %s: %v", name, err)
 						return err
 					}
 				} else {
@@ -167,7 +167,7 @@ func generateRunlabelCommand(runlabel string, img *libimage.Image, inputName str
 			// I would prefer to use os.getenv but it appears PWD is not in the os env list.
 			d, err := os.Getwd()
 			if err != nil {
-				logrus.Error("unable to determine current working directory")
+				logrus.Error("Unable to determine current working directory")
 				return ""
 			}
 			return d
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index f8ee0304d..705ad7768 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -573,7 +573,7 @@ func (ir *ImageEngine) Sign(ctx context.Context, names []string, options entitie
 			}
 			defer func() {
 				if err = rawSource.Close(); err != nil {
-					logrus.Errorf("unable to close %s image source %q", srcRef.DockerReference().Name(), err)
+					logrus.Errorf("Unable to close %s image source %q", srcRef.DockerReference().Name(), err)
 				}
 			}()
 			topManifestBlob, manifestType, err := rawSource.GetManifest(ctx, nil)
diff --git a/pkg/domain/infra/abi/manifest.go b/pkg/domain/infra/abi/manifest.go
index 1dd0686ac..d1bd5e2e4 100644
--- a/pkg/domain/infra/abi/manifest.go
+++ b/pkg/domain/infra/abi/manifest.go
@@ -146,7 +146,7 @@ func (ir *ImageEngine) remoteManifestInspect(ctx context.Context, name string) (
 
 	switch manType {
 	case manifest.DockerV2Schema2MediaType:
-		logrus.Warnf("Warning! The manifest type %s is not a manifest list but a single image.", manType)
+		logrus.Warnf("The manifest type %s is not a manifest list but a single image.", manType)
 		schema2Manifest, err := manifest.Schema2FromManifest(result)
 		if err != nil {
 			return nil, errors.Wrapf(err, "error parsing manifest blob %q as a %q", string(result), manType)
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go
index 87506f70c..e386c17e9 100644
--- a/pkg/domain/infra/abi/play.go
+++ b/pkg/domain/infra/abi/play.go
@@ -113,7 +113,7 @@ func (ic *ContainerEngine) PlayKube(ctx context.Context, path string, options en
 			report.Volumes = append(report.Volumes, r.Volumes...)
 			validKinds++
 		default:
-			logrus.Infof("kube kind %s not supported", kind)
+			logrus.Infof("Kube kind %s not supported", kind)
 			continue
 		}
 	}
@@ -662,21 +662,21 @@ func getBuildFile(imageName string, cwd string) (string, error) {
 	containerfilePath := filepath.Join(cwd, buildDirName, "Containerfile")
 	dockerfilePath := filepath.Join(cwd, buildDirName, "Dockerfile")
 
-	_, err := os.Stat(filepath.Join(containerfilePath))
+	_, err := os.Stat(containerfilePath)
 	if err == nil {
-		logrus.Debugf("building %s with %s", imageName, containerfilePath)
+		logrus.Debugf("Building %s with %s", imageName, containerfilePath)
 		return containerfilePath, nil
 	}
 	// If the error is not because the file does not exist, take
 	// a mulligan and try Dockerfile.  If that also fails, return that
 	// error
 	if err != nil && !os.IsNotExist(err) {
-		logrus.Errorf("%v: unable to check for %s", err, containerfilePath)
+		logrus.Error(err.Error())
 	}
 
 	_, err = os.Stat(filepath.Join(dockerfilePath))
 	if err == nil {
-		logrus.Debugf("building %s with %s", imageName, dockerfilePath)
+		logrus.Debugf("Building %s with %s", imageName, dockerfilePath)
 		return dockerfilePath, nil
 	}
 	// Strike two
diff --git a/pkg/domain/infra/abi/terminal/sigproxy_linux.go b/pkg/domain/infra/abi/terminal/sigproxy_linux.go
index a9bd2d5fb..3b129f5ea 100644
--- a/pkg/domain/infra/abi/terminal/sigproxy_linux.go
+++ b/pkg/domain/infra/abi/terminal/sigproxy_linux.go
@@ -42,7 +42,7 @@ func ProxySignals(ctr *libpod.Container) {
 				if errors.Cause(err) == define.ErrCtrStateInvalid {
 					logrus.Infof("Ceasing signal forwarding to container %s as it has stopped", ctr.ID())
 				} else {
-					logrus.Errorf("Error forwarding signal %d to container %s: %v", s, ctr.ID(), err)
+					logrus.Errorf("forwarding signal %d to container %s: %v", s, ctr.ID(), err)
 				}
 				// If the container dies, and we find out here,
 				// we need to forward that one signal to
@@ -51,7 +51,7 @@ func ProxySignals(ctr *libpod.Container) {
 				// play out.
 				signal.StopCatch(sigBuffer)
 				if err := syscall.Kill(syscall.Getpid(), s.(syscall.Signal)); err != nil {
-					logrus.Errorf("failed to kill pid %d", syscall.Getpid())
+					logrus.Errorf("Failed to kill pid %d", syscall.Getpid())
 				}
 				return
 			}
diff --git a/pkg/domain/infra/abi/terminal/terminal_linux.go b/pkg/domain/infra/abi/terminal/terminal_linux.go
index 09c0f802d..ba047bf33 100644
--- a/pkg/domain/infra/abi/terminal/terminal_linux.go
+++ b/pkg/domain/infra/abi/terminal/terminal_linux.go
@@ -29,7 +29,7 @@ func ExecAttachCtr(ctx context.Context, ctr *libpod.Container, execConfig *libpo
 		defer cancel()
 		defer func() {
 			if err := restoreTerminal(oldTermState); err != nil {
-				logrus.Errorf("unable to restore terminal: %q", err)
+				logrus.Errorf("Unable to restore terminal: %q", err)
 			}
 		}()
 	}
@@ -53,7 +53,7 @@ func StartAttachCtr(ctx context.Context, ctr *libpod.Container, stdout, stderr,
 		}
 		defer func() {
 			if err := restoreTerminal(oldTermState); err != nil {
-				logrus.Errorf("unable to restore terminal: %q", err)
+				logrus.Errorf("Unable to restore terminal: %q", err)
 			}
 		}()
 		defer cancel()
diff --git a/pkg/domain/infra/abi/trust.go b/pkg/domain/infra/abi/trust.go
index d3aff62ba..af7814163 100644
--- a/pkg/domain/infra/abi/trust.go
+++ b/pkg/domain/infra/abi/trust.go
@@ -165,7 +165,7 @@ var typeDescription = map[string]string{"insecureAcceptAnything": "accept", "sig
 func trustTypeDescription(trustType string) string {
 	trustDescription, exist := typeDescription[trustType]
 	if !exist {
-		logrus.Warnf("invalid trust type %s", trustType)
+		logrus.Warnf("Invalid trust type %s", trustType)
 	}
 	return trustDescription
 }
diff --git a/pkg/domain/infra/runtime_libpod.go b/pkg/domain/infra/runtime_libpod.go
index 5cbee2e76..7ec6135ee 100644
--- a/pkg/domain/infra/runtime_libpod.go
+++ b/pkg/domain/infra/runtime_libpod.go
@@ -369,7 +369,7 @@ func StartWatcher(rt *libpod.Runtime) {
 			logrus.Debugf("waiting for SIGHUP to reload configuration")
 			<-ch
 			if err := rt.Reload(); err != nil {
-				logrus.Errorf("unable to reload configuration: %v", err)
+				logrus.Errorf("Unable to reload configuration: %v", err)
 				continue
 			}
 		}
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index 81ddce42f..9fe2d163c 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -561,7 +561,7 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
 				errorhandling.Contains(err, define.ErrCtrRemoved) {
 				logrus.Debugf("Container %s does not exist: %v", id, err)
 			} else {
-				logrus.Errorf("Error removing container %s: %v", id, err)
+				logrus.Errorf("Removing container %s: %v", id, err)
 			}
 		}
 	}
@@ -646,7 +646,7 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
 							errorhandling.Contains(err, types.ErrLayerUnknown) {
 							logrus.Debugf("Container %s does not exist: %v", ctr.ID, err)
 						} else {
-							logrus.Errorf("Error removing container %s: %v", ctr.ID, err)
+							logrus.Errorf("Removing container %s: %v", ctr.ID, err)
 						}
 					}
 				}
@@ -731,7 +731,7 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta
 						errorhandling.Contains(err, types.ErrLayerUnknown) {
 						logrus.Debugf("Container %s does not exist: %v", con.ID, err)
 					} else {
-						logrus.Errorf("Error removing container %s: %v", con.ID, err)
+						logrus.Errorf("Removing container %s: %v", con.ID, err)
 					}
 				}
 			}
diff --git a/pkg/errorhandling/errorhandling.go b/pkg/errorhandling/errorhandling.go
index 6adbc9f34..44a0c3efd 100644
--- a/pkg/errorhandling/errorhandling.go
+++ b/pkg/errorhandling/errorhandling.go
@@ -63,7 +63,7 @@ func StringsToErrors(strErrs []string) []error {
 // a defer.
 func SyncQuiet(f *os.File) {
 	if err := f.Sync(); err != nil {
-		logrus.Errorf("unable to sync file %s: %q", f.Name(), err)
+		logrus.Errorf("Unable to sync file %s: %q", f.Name(), err)
 	}
 }
 
@@ -71,7 +71,7 @@ func SyncQuiet(f *os.File) {
 // a defer.
 func CloseQuiet(f *os.File) {
 	if err := f.Close(); err != nil {
-		logrus.Errorf("unable to close file %s: %q", f.Name(), err)
+		logrus.Errorf("Unable to close file %s: %q", f.Name(), err)
 	}
 }
 
diff --git a/pkg/hooks/exec/exec.go b/pkg/hooks/exec/exec.go
index f6b6636ad..2b7bc5f31 100644
--- a/pkg/hooks/exec/exec.go
+++ b/pkg/hooks/exec/exec.go
@@ -56,7 +56,7 @@ func Run(ctx context.Context, hook *rspec.Hook, state []byte, stdout io.Writer,
 		return err, err
 	case <-ctx.Done():
 		if err := cmd.Process.Kill(); err != nil {
-			logrus.Errorf("failed to kill pid %v", cmd.Process)
+			logrus.Errorf("Failed to kill pid %v", cmd.Process)
 		}
 		timer := time.NewTimer(postKillTimeout)
 		defer timer.Stop()
diff --git a/pkg/hooks/exec/runtimeconfigfilter.go b/pkg/hooks/exec/runtimeconfigfilter.go
index 10b8fedc2..3ab3073b2 100644
--- a/pkg/hooks/exec/runtimeconfigfilter.go
+++ b/pkg/hooks/exec/runtimeconfigfilter.go
@@ -61,7 +61,7 @@ func RuntimeConfigFilter(ctx context.Context, hooks []spec.Hook, config *spec.Sp
 			if err == nil {
 				logrus.Debugf("precreate hook %d made configuration changes:\n%s", i, diff)
 			} else {
-				logrus.Warnf("precreate hook %d made configuration changes, but we could not compute a diff: %v", i, err)
+				logrus.Warnf("Precreate hook %d made configuration changes, but we could not compute a diff: %v", i, err)
 			}
 		}
 
diff --git a/pkg/hooks/monitor.go b/pkg/hooks/monitor.go
index 6fa94cd17..ece6e52d1 100644
--- a/pkg/hooks/monitor.go
+++ b/pkg/hooks/monitor.go
@@ -36,7 +36,7 @@ func (m *Manager) Monitor(ctx context.Context, sync chan<- error) {
 	for _, dir := range m.directories {
 		err = watcher.Add(dir)
 		if err != nil {
-			logrus.Errorf("failed to watch %q for hooks", dir)
+			logrus.Errorf("Failed to watch %q for hooks", dir)
 			sync <- err
 			return
 		}
@@ -52,7 +52,7 @@ func (m *Manager) Monitor(ctx context.Context, sync chan<- error) {
 			for _, dir := range m.directories {
 				err = ReadDir(dir, m.extensionStages, m.hooks)
 				if err != nil {
-					logrus.Errorf("failed loading hooks for %s: %v", event.Name, err)
+					logrus.Errorf("Failed loading hooks for %s: %v", event.Name, err)
 				}
 			}
 		case <-ctx.Done():
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index d5f538594..394177003 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -366,7 +366,7 @@ func (v *MachineVM) Stop(name string, _ machine.StopOptions) error {
 		return err
 	}
 	if _, err := os.Stat(pidFile); os.IsNotExist(err) {
-		logrus.Infof("pid file %s does not exist", pidFile)
+		logrus.Info(err)
 		return nil
 	}
 	pidString, err := ioutil.ReadFile(pidFile)
diff --git a/pkg/netns/netns_linux.go b/pkg/netns/netns_linux.go
index c13ae2f4d..3e6e668b5 100644
--- a/pkg/netns/netns_linux.go
+++ b/pkg/netns/netns_linux.go
@@ -133,19 +133,19 @@ func NewNSWithName(name string) (ns.NetNS, error) {
 		var origNS ns.NetNS
 		origNS, err = ns.GetNS(threadNsPath)
 		if err != nil {
-			logrus.Warnf("cannot open current network namespace %s: %q", threadNsPath, err)
+			logrus.Warnf("Cannot open current network namespace %s: %q", threadNsPath, err)
 			return
 		}
 		defer func() {
 			if err := origNS.Close(); err != nil {
-				logrus.Errorf("unable to close namespace: %q", err)
+				logrus.Errorf("Unable to close namespace: %q", err)
 			}
 		}()
 
 		// create a new netns on the current thread
 		err = unix.Unshare(unix.CLONE_NEWNET)
 		if err != nil {
-			logrus.Warnf("cannot create a new network namespace: %q", err)
+			logrus.Warnf("Cannot create a new network namespace: %q", err)
 			return
 		}
 
@@ -157,7 +157,7 @@ func NewNSWithName(name string) (ns.NetNS, error) {
 					// the network namespace owned by root on the host.
 					return
 				}
-				logrus.Warnf("unable to reset namespace: %q", err)
+				logrus.Warnf("Unable to reset namespace: %q", err)
 			}
 		}()
 
diff --git a/pkg/ps/ps.go b/pkg/ps/ps.go
index 54079baa1..bf3286028 100644
--- a/pkg/ps/ps.go
+++ b/pkg/ps/ps.go
@@ -139,11 +139,11 @@ func ListContainerBatch(rt *libpod.Runtime, ctr *libpod.Container, opts entities
 		}
 		startedTime, err = c.StartedTime()
 		if err != nil {
-			logrus.Errorf("error getting started time for %q: %v", c.ID(), err)
+			logrus.Errorf("Getting started time for %q: %v", c.ID(), err)
 		}
 		exitedTime, err = c.FinishedTime()
 		if err != nil {
-			logrus.Errorf("error getting exited time for %q: %v", c.ID(), err)
+			logrus.Errorf("Getting exited time for %q: %v", c.ID(), err)
 		}
 
 		pid, err = c.PID()
@@ -170,12 +170,12 @@ func ListContainerBatch(rt *libpod.Runtime, ctr *libpod.Container, opts entities
 
 			rootFsSize, err := c.RootFsSize()
 			if err != nil {
-				logrus.Errorf("error getting root fs size for %q: %v", c.ID(), err)
+				logrus.Errorf("Getting root fs size for %q: %v", c.ID(), err)
 			}
 
 			rwSize, err := c.RWSize()
 			if err != nil {
-				logrus.Errorf("error getting rw size for %q: %v", c.ID(), err)
+				logrus.Errorf("Getting rw size for %q: %v", c.ID(), err)
 			}
 
 			size.RootFsSize = rootFsSize
diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go
index c046ecde7..7f9228666 100644
--- a/pkg/rootless/rootless_linux.go
+++ b/pkg/rootless/rootless_linux.go
@@ -61,20 +61,20 @@ func IsRootless() bool {
 		if rootlessUIDInit != 0 {
 			// This happens if we joined the user+mount namespace as part of
 			if err := os.Setenv("_CONTAINERS_USERNS_CONFIGURED", "done"); err != nil {
-				logrus.Errorf("failed to set environment variable %s as %s", "_CONTAINERS_USERNS_CONFIGURED", "done")
+				logrus.Errorf("Failed to set environment variable %s as %s", "_CONTAINERS_USERNS_CONFIGURED", "done")
 			}
 			if err := os.Setenv("_CONTAINERS_ROOTLESS_UID", fmt.Sprintf("%d", rootlessUIDInit)); err != nil {
-				logrus.Errorf("failed to set environment variable %s as %d", "_CONTAINERS_ROOTLESS_UID", rootlessUIDInit)
+				logrus.Errorf("Failed to set environment variable %s as %d", "_CONTAINERS_ROOTLESS_UID", rootlessUIDInit)
 			}
 			if err := os.Setenv("_CONTAINERS_ROOTLESS_GID", fmt.Sprintf("%d", rootlessGIDInit)); err != nil {
-				logrus.Errorf("failed to set environment variable %s as %d", "_CONTAINERS_ROOTLESS_GID", rootlessGIDInit)
+				logrus.Errorf("Failed to set environment variable %s as %d", "_CONTAINERS_ROOTLESS_GID", rootlessGIDInit)
 			}
 		}
 		isRootless = os.Geteuid() != 0 || os.Getenv("_CONTAINERS_USERNS_CONFIGURED") != ""
 		if !isRootless {
 			hasCapSysAdmin, err := unshare.HasCapSysAdmin()
 			if err != nil {
-				logrus.Warnf("failed to read CAP_SYS_ADMIN presence for the current process")
+				logrus.Warnf("Failed to read CAP_SYS_ADMIN presence for the current process")
 			}
 			if err == nil && !hasCapSysAdmin {
 				isRootless = true
@@ -284,12 +284,12 @@ func becomeRootInUserNS(pausePid, fileToRead string, fileOutput *os.File) (_ boo
 			toWrite = []byte("1")
 		}
 		if _, err := w.Write(toWrite); err != nil {
-			logrus.Errorf("failed to write byte 0: %q", err)
+			logrus.Errorf("Failed to write byte 0: %q", err)
 		}
 		if retErr != nil && pid > 0 {
 			if err := unix.Kill(pid, unix.SIGKILL); err != nil {
 				if err != unix.ESRCH {
-					logrus.Errorf("failed to cleanup process %d: %v", pid, err)
+					logrus.Errorf("Failed to cleanup process %d: %v", pid, err)
 				}
 			}
 			C.reexec_in_user_namespace_wait(C.int(pid), 0)
@@ -325,7 +325,7 @@ func becomeRootInUserNS(pausePid, fileToRead string, fileOutput *os.File) (_ boo
 		uidsMapped = err == nil
 	}
 	if !uidsMapped {
-		logrus.Warnf("using rootless single mapping into the namespace. This might break some images. Check /etc/subuid and /etc/subgid for adding sub*ids")
+		logrus.Warnf("Using rootless single mapping into the namespace. This might break some images. Check /etc/subuid and /etc/subgid for adding sub*ids")
 		setgroups := fmt.Sprintf("/proc/%d/setgroups", pid)
 		err = ioutil.WriteFile(setgroups, []byte("deny\n"), 0666)
 		if err != nil {
@@ -416,7 +416,7 @@ func becomeRootInUserNS(pausePid, fileToRead string, fileOutput *os.File) (_ boo
 
 			if err := unix.Kill(int(pidC), s.(unix.Signal)); err != nil {
 				if err != unix.ESRCH {
-					logrus.Errorf("failed to propagate signal to child process %d: %v", int(pidC), err)
+					logrus.Errorf("Failed to propagate signal to child process %d: %v", int(pidC), err)
 				}
 			}
 		}
diff --git a/pkg/rootlessport/rootlessport_linux.go b/pkg/rootlessport/rootlessport_linux.go
index 6c7b8e6d7..37fb7ce79 100644
--- a/pkg/rootlessport/rootlessport_linux.go
+++ b/pkg/rootlessport/rootlessport_linux.go
@@ -125,17 +125,17 @@ func parent() error {
 	quit := make(chan struct{})
 	errCh := make(chan error)
 	// start the parent driver. initComplete will be closed when the child connected to the parent.
-	logrus.Infof("starting parent driver")
+	logrus.Infof("Starting parent driver")
 	go func() {
 		driverErr := driver.RunParentDriver(initComplete, quit, nil)
 		if driverErr != nil {
-			logrus.WithError(driverErr).Warn("parent driver exited")
+			logrus.WithError(driverErr).Warn("Parent driver exited")
 		}
 		errCh <- driverErr
 		close(errCh)
 	}()
 	opaque := driver.OpaqueForChild()
-	logrus.Infof("opaque=%+v", opaque)
+	logrus.Infof("Opaque=%+v", opaque)
 	opaqueJSON, err := json.Marshal(opaque)
 	if err != nil {
 		return err
@@ -146,9 +146,9 @@ func parent() error {
 	}
 	defer func() {
 		// stop the child
-		logrus.Info("stopping child driver")
+		logrus.Info("Stopping child driver")
 		if err := childQuitW.Close(); err != nil {
-			logrus.WithError(err).Warn("unable to close childQuitW")
+			logrus.WithError(err).Warn("Unable to close childQuitW")
 		}
 	}()
 
@@ -164,7 +164,7 @@ func parent() error {
 		return err
 	}
 	if err := childNS.Do(func(_ ns.NetNS) error {
-		logrus.Infof("starting child driver in child netns (%q %v)", cmd.Path, cmd.Args)
+		logrus.Infof("Starting child driver in child netns (%q %v)", cmd.Path, cmd.Args)
 		return cmd.Start()
 	}); err != nil {
 		return err
@@ -179,11 +179,11 @@ func parent() error {
 
 	defer func() {
 		if err := unix.Kill(cmd.Process.Pid, unix.SIGTERM); err != nil {
-			logrus.WithError(err).Warn("kill child process")
+			logrus.WithError(err).Warn("Kill child process")
 		}
 	}()
 
-	logrus.Info("waiting for initComplete")
+	logrus.Info("Waiting for initComplete")
 	// wait for the child to connect to the parent
 outer:
 	for {
@@ -203,15 +203,15 @@ outer:
 	}
 
 	defer func() {
-		logrus.Info("stopping parent driver")
+		logrus.Info("Stopping parent driver")
 		quit <- struct{}{}
 		if err := <-errCh; err != nil {
-			logrus.WithError(err).Warn("parent driver returned error on exit")
+			logrus.WithError(err).Warn("Parent driver returned error on exit")
 		}
 	}()
 
 	// let parent expose ports
-	logrus.Infof("exposing ports %v", cfg.Mappings)
+	logrus.Infof("Exposing ports %v", cfg.Mappings)
 	if err := exposePorts(driver, cfg.Mappings, cfg.ChildIP); err != nil {
 		return err
 	}
@@ -235,13 +235,13 @@ outer:
 		// remove the socket file on exit
 		defer os.Remove(socketfile)
 		if err != nil {
-			logrus.Warnf("failed to close the socketDir fd: %v", err)
+			logrus.Warnf("Failed to close the socketDir fd: %v", err)
 		}
 		defer socket.Close()
 		go serve(socket, driver)
 	}
 
-	logrus.Info("ready")
+	logrus.Info("Ready")
 
 	// https://github.com/containers/podman/issues/11248
 	// Copy /dev/null to stdout and stderr to prevent SIGPIPE errors
@@ -259,7 +259,7 @@ outer:
 	}
 
 	// wait for ExitFD to be closed
-	logrus.Info("waiting for exitfd to be closed")
+	logrus.Info("Waiting for exitfd to be closed")
 	if _, err := ioutil.ReadAll(exitR); err != nil {
 		return err
 	}
@@ -353,10 +353,10 @@ func child() error {
 		errCh <- dErr
 	}()
 	defer func() {
-		logrus.Info("stopping child driver")
+		logrus.Info("Stopping child driver")
 		quit <- struct{}{}
 		if err := <-errCh; err != nil {
-			logrus.WithError(err).Warn("child driver returned error on exit")
+			logrus.WithError(err).Warn("Child driver returned error on exit")
 		}
 	}()
 
diff --git a/pkg/servicereaper/service.go b/pkg/servicereaper/service.go
index e9c4fe908..e105148f0 100644
--- a/pkg/servicereaper/service.go
+++ b/pkg/servicereaper/service.go
@@ -46,7 +46,7 @@ func reaper(sigc chan os.Signal) {
 			if err != nil {
 				// do not log error for ECHILD
 				if err != syscall.ECHILD {
-					logrus.Warnf("wait for pid %d failed: %v ", pid, err)
+					logrus.Warnf("Wait for pid %d failed: %v ", pid, err)
 				}
 				delete(s.pidMap, pid)
 				continue
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go
index 55010f716..beccd9fc2 100644
--- a/pkg/specgen/generate/oci.go
+++ b/pkg/specgen/generate/oci.go
@@ -62,7 +62,7 @@ func addRlimits(s *specgen.SpecGenerator, g *generate.Generator) error {
 		if isRootless {
 			var rlimit unix.Rlimit
 			if err := unix.Getrlimit(unix.RLIMIT_NOFILE, &rlimit); err != nil {
-				logrus.Warnf("failed to return RLIMIT_NOFILE ulimit %q", err)
+				logrus.Warnf("Failed to return RLIMIT_NOFILE ulimit %q", err)
 			}
 			if rlimit.Cur < current {
 				current = rlimit.Cur
@@ -79,7 +79,7 @@ func addRlimits(s *specgen.SpecGenerator, g *generate.Generator) error {
 		if isRootless {
 			var rlimit unix.Rlimit
 			if err := unix.Getrlimit(unix.RLIMIT_NPROC, &rlimit); err != nil {
-				logrus.Warnf("failed to return RLIMIT_NPROC ulimit %q", err)
+				logrus.Warnf("Failed to return RLIMIT_NPROC ulimit %q", err)
 			}
 			if rlimit.Cur < current {
 				current = rlimit.Cur
diff --git a/pkg/specgen/generate/security.go b/pkg/specgen/generate/security.go
index a12cc09e2..a11debdb5 100644
--- a/pkg/specgen/generate/security.go
+++ b/pkg/specgen/generate/security.go
@@ -139,7 +139,7 @@ func securityConfigureGenerator(s *specgen.SpecGenerator, g *generate.Generator,
 			if len(privCapsRequired) == 0 {
 				caplist = capsRequired
 			} else {
-				logrus.Errorf("capabilities requested by user or image are not allowed by default: %q", strings.Join(privCapsRequired, ","))
+				logrus.Errorf("Capabilities requested by user or image are not allowed by default: %q", strings.Join(privCapsRequired, ","))
 			}
 		}
 	}
diff --git a/pkg/trust/trust.go b/pkg/trust/trust.go
index 18a6a1717..584d1fa02 100644
--- a/pkg/trust/trust.go
+++ b/pkg/trust/trust.go
@@ -188,7 +188,7 @@ func GetGPGIdFromKeyPath(path string) []string {
 	cmd := exec.Command("gpg2", "--with-colons", path)
 	results, err := cmd.Output()
 	if err != nil {
-		logrus.Errorf("error getting key identity: %s", err)
+		logrus.Errorf("Getting key identity: %s", err)
 		return nil
 	}
 	return parseUids(results)
@@ -203,7 +203,7 @@ func GetGPGIdFromKeyData(key string) []string {
 	}
 	tmpfileName, err := CreateTmpFile("", "", decodeKey)
 	if err != nil {
-		logrus.Errorf("error creating key date temp file %s", err)
+		logrus.Errorf("Creating key date temp file %s", err)
 	}
 	defer os.Remove(tmpfileName)
 	return GetGPGIdFromKeyPath(tmpfileName)