8 files changed, 14 insertions, 15 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/images.go b/pkg/api/handlers/libpod/images.go
index 51157d204..0023479ea 100644
--- a/pkg/api/handlers/libpod/images.go
+++ b/pkg/api/handlers/libpod/images.go
@@ -359,7 +359,6 @@ func ExportImages(w http.ResponseWriter, r *http.Request) {
 		MultiImageArchive:           len(query.References) > 1,
 		OciAcceptUncompressedLayers: query.OciAcceptUncompressedLayers,
 		Output:                      output,
-		RemoveSignatures:            true,
 	}
 
 	imageEngine := abi.ImageEngine{Libpod: runtime}
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()