diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-09-27 17:22:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-27 17:22:36 +0200 |
| commit | 92e1b661ff5fba140ba07dd2c956e5aede90e9b5 (patch) | |
| tree | c6847a0e4e0d2be4e72aec8a00c9aaa5816d78a9 /cmd | |
| parent | 849c36d1ad7a4cda1ed793653b0a80660dd4fdcc (diff) | |
| parent | 62c0b387f560efedfb3cc02ba3c4803d80882d82 (diff) | |
| download | podman-92e1b661ff5fba140ba07dd2c956e5aede90e9b5.tar.gz podman-92e1b661ff5fba140ba07dd2c956e5aede90e9b5.tar.bz2 podman-92e1b661ff5fba140ba07dd2c956e5aede90e9b5.zip | |
Merge pull request #4124 from mheon/set_log_level_early
Set log-level immediately, before rootless setup
Diffstat (limited to 'cmd')
| -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 } |