From f00cc25a7c655022785389e6778693c6a7763bdc Mon Sep 17 00:00:00 2001 From: Daniel J Walsh 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 --- vendor/github.com/cri-o/ocicni/pkg/ocicni/ocicni.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vendor/github.com/cri-o') diff --git a/vendor/github.com/cri-o/ocicni/pkg/ocicni/ocicni.go b/vendor/github.com/cri-o/ocicni/pkg/ocicni/ocicni.go index ee09adc8d..7a9f97d1c 100644 --- a/vendor/github.com/cri-o/ocicni/pkg/ocicni/ocicni.go +++ b/vendor/github.com/cri-o/ocicni/pkg/ocicni/ocicni.go @@ -149,7 +149,7 @@ func (plugin *cniNetworkPlugin) monitorConfDir(start *sync.WaitGroup) { for { select { case event := <-plugin.watcher.Events: - logrus.Warningf("CNI monitoring event %v", event) + logrus.Infof("CNI monitoring event %v", event) var defaultDeleted bool createWrite := (event.Op&fsnotify.Create == fsnotify.Create || @@ -295,7 +295,7 @@ func loadNetworks(confDir string, cni *libcni.CNIConfig) (map[string]*cniNetwork } } if len(confList.Plugins) == 0 { - logrus.Warningf("CNI config list %s has no networks, skipping", confFile) + logrus.Infof("CNI config list %s has no networks, skipping", confFile) continue } @@ -350,7 +350,7 @@ func (plugin *cniNetworkPlugin) syncNetworkConfig() error { plugin.defaultNetName.name = defaultNetName logrus.Infof("Update default CNI network name to %s", defaultNetName) } else { - logrus.Warnf("Default CNI network name %s is unchangeable", plugin.defaultNetName.name) + logrus.Debugf("Default CNI network name %s is unchangeable", plugin.defaultNetName.name) } plugin.networks = networks -- cgit v1.2.3-54-g00ecf