From f00cc25a7c655022785389e6778693c6a7763bdc Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Tue, 1 Dec 2020 16:15:14 -0500
Subject: Drop default log-level from error to warn

Our users are missing certain warning messages that would
make debugging issues with Podman easier.

For example if you do a podman build with a Containerfile
that contains the SHELL directive, the Derective is silently
ignored.

If you run with the log-level warn you get a warning message explainging
what happened.

$ podman build --no-cache -f /tmp/Containerfile1 /tmp/
STEP 1: FROM ubi8
STEP 2: SHELL ["/bin/bash", "-c"]
STEP 3: COMMIT
--> 7a207be102a
7a207be102aa8993eceb32802e6ceb9d2603ceed9dee0fee341df63e6300882e

$ podman --log-level=warn build --no-cache -f /tmp/Containerfile1 /tmp/
STEP 1: FROM ubi8
STEP 2: SHELL ["/bin/bash", "-c"]
STEP 3: COMMIT
WARN[0000] SHELL is not supported for OCI image format, [/bin/bash -c] will be ignored. Must use `docker` format
--> 7bd96fd25b9
7bd96fd25b9f755d8a045e31187e406cf889dcf3799357ec906e90767613e95f

These messages will no longer be lost, when we default to WARNing level.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 pkg/api/handlers/compat/images_build.go | 4 ++--
 pkg/bindings/containers/attach.go       | 4 ++--
 pkg/systemd/generate/pods.go            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkg')

diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go
index 149050209..43478c1d3 100644
--- a/pkg/api/handlers/compat/images_build.go
+++ b/pkg/api/handlers/compat/images_build.go
@@ -263,7 +263,7 @@ loop:
 			failed = true
 			m.Error = string(e)
 			if err := enc.Encode(m); err != nil {
-				logrus.Warnf("Failed to json encode error %q", err.Error())
+				logrus.Warnf("Failed to json encode error %v", err)
 			}
 			flush()
 		case <-runCtx.Done():
@@ -271,7 +271,7 @@ loop:
 				if !utils.IsLibpodRequest(r) {
 					m.Stream = fmt.Sprintf("Successfully built %12.12s\n", imageID)
 					if err := enc.Encode(m); err != nil {
-						logrus.Warnf("Failed to json encode error %q", err.Error())
+						logrus.Warnf("Failed to json encode error %v", err)
 					}
 					flush()
 				}
diff --git a/pkg/bindings/containers/attach.go b/pkg/bindings/containers/attach.go
index 7b321af93..91b155fc4 100644
--- a/pkg/bindings/containers/attach.go
+++ b/pkg/bindings/containers/attach.go
@@ -332,7 +332,7 @@ func attachHandleResize(ctx, winCtx context.Context, winChange chan os.Signal, i
 		case <-winChange:
 			h, w, err := terminal.GetSize(int(file.Fd()))
 			if err != nil {
-				logrus.Warnf("failed to obtain TTY size: " + err.Error())
+				logrus.Warnf("failed to obtain TTY size: %v", err)
 			}
 
 			var resizeErr error
@@ -342,7 +342,7 @@ func attachHandleResize(ctx, winCtx context.Context, winChange chan os.Signal, i
 				resizeErr = ResizeContainerTTY(ctx, id, &h, &w)
 			}
 			if resizeErr != nil {
-				logrus.Warnf("failed to resize TTY: " + resizeErr.Error())
+				logrus.Warnf("failed to resize TTY: %v", err)
 			}
 		}
 	}
diff --git a/pkg/systemd/generate/pods.go b/pkg/systemd/generate/pods.go
index c0acba37d..234a60380 100644
--- a/pkg/systemd/generate/pods.go
+++ b/pkg/systemd/generate/pods.go
@@ -224,7 +224,7 @@ func executePodTemplate(info *podInfo, options entities.GenerateSystemdOptions)
 		executable, err := os.Executable()
 		if err != nil {
 			executable = "/usr/bin/podman"
-			logrus.Warnf("Could not obtain podman executable location, using default %s", executable)
+			logrus.Warnf("Could not obtain podman executable location, using default %s: %v", executable, err)
 		}
 		info.Executable = executable
 	}
-- 
cgit v1.2.3-54-g00ecf