opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 17:13:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4124 from mheon/set_log_level_early

Browse Source 
Set log-level immediately, before rootless setup
This commit is contained in:
OpenShift Merge Robot
2019-09-27 17:22:36 +02:00
committed by GitHub
parent 849c36d1ad 62c0b387f5
commit 92e1b661ff
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/podman/main.go
View File

@ -107,15 +107,6 @@ func before(cmd *cobra.Command, args []string) error {
os.Exit(1) 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 // Set log level; if not log-level is provided, default to error
logLevel := MainGlobalOpts.LogLevel logLevel := MainGlobalOpts.LogLevel
if logLevel == "" { if logLevel == "" {
@ -130,6 +121,15 @@ func before(cmd *cobra.Command, args []string) error {
return err 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 { if err := setRLimits(); err != nil {
return err return err
} }

2
pkg/rootless/rootless_linux.go
View File

@ -365,7 +365,7 @@ func GetConfiguredMappings() ([]idtools.IDMap, []idtools.IDMap, error) {
} }
mappings, err := idtools.NewIDMappings(username, username) mappings, err := idtools.NewIDMappings(username, username)
if err != nil { if err != nil {
logrus.Warnf("cannot find mappings for user %s: %v", username, err) logrus.Errorf("cannot find mappings for user %s: %v", username, err)
} else { } else {
uids = mappings.UIDs() uids = mappings.UIDs()
gids = mappings.GIDs() gids = mappings.GIDs()