diff options
author | Matthew Heon <matthew.heon@pm.me> | 2019-09-26 16:12:18 -0400 |
---|---|---|
committer | Matthew Heon <matthew.heon@pm.me> | 2019-09-26 16:14:57 -0400 |
commit | 62c0b387f560efedfb3cc02ba3c4803d80882d82 (patch) | |
tree | 67f702e83e7b48cd148ced6b5695ff1aea514628 /cmd/podman | |
parent | 19075ca16e6b34cc7f25d3fbc0fad96b44cbfef5 (diff) | |
download | podman-62c0b387f560efedfb3cc02ba3c4803d80882d82.tar.gz podman-62c0b387f560efedfb3cc02ba3c4803d80882d82.tar.bz2 podman-62c0b387f560efedfb3cc02ba3c4803d80882d82.zip |
Set log-level immediately, before rootless setup
If we don't do this, we print WARN level messages that we should
not be printing by default.
Up one WARN message to ERROR so it still shows up by default.
Fixes: #4115
Fixes: #4012
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'cmd/podman')
-rw-r--r-- | cmd/podman/main.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go index 992dbe1d5..8cc8a0b8e 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -107,15 +107,6 @@ func before(cmd *cobra.Command, args []string) error { os.Exit(1) } - if err := setupRootless(cmd, args); err != nil { - return err - } - - // check that global opts input is valid - if err := checkInput(); err != nil { - return err - } - // Set log level; if not log-level is provided, default to error logLevel := MainGlobalOpts.LogLevel if logLevel == "" { @@ -130,6 +121,15 @@ func before(cmd *cobra.Command, args []string) error { return err } + if err := setupRootless(cmd, args); err != nil { + return err + } + + // check that global opts input is valid + if err := checkInput(); err != nil { + return err + } + if err := setRLimits(); err != nil { return err } |