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

Merge pull request #15317 from rhatdan/debug

Browse Source 
Add compatibility support for --debug flag from docker
This commit is contained in:
OpenShift Merge Robot
2022-08-16 15:09:12 +00:00
committed by GitHub
parent 552225c414 2d30b4dee5
commit 3dace12777
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/podman/root.go
View File

@ -71,7 +71,10 @@ var (
DisableFlagsInUseLine: true, DisableFlagsInUseLine: true,
} }
logLevel = "warn" defaultLogLevel = "warn"
logLevel = defaultLogLevel
debug bool
useSyslog bool useSyslog bool
requireCleanup = true requireCleanup = true
) )
@ -310,6 +313,13 @@ func persistentPostRunE(cmd *cobra.Command, args []string) error {
func loggingHook() { func loggingHook() {
var found bool var found bool
if debug {
if logLevel != defaultLogLevel {
fmt.Fprintf(os.Stderr, "Setting --log-level and --debug is not allowed\n")
os.Exit(1)
}
logLevel = "debug"
}
for _, l := range common.LogLevels { for _, l := range common.LogLevels {
if l == strings.ToLower(logLevel) { if l == strings.ToLower(logLevel) {
found = true found = true
@ -465,6 +475,9 @@ func rootFlags(cmd *cobra.Command, opts *entities.PodmanConfig) {
pFlags.StringVar(&logLevel, logLevelFlagName, logLevel, fmt.Sprintf("Log messages above specified level (%s)", strings.Join(common.LogLevels, ", "))) pFlags.StringVar(&logLevel, logLevelFlagName, logLevel, fmt.Sprintf("Log messages above specified level (%s)", strings.Join(common.LogLevels, ", ")))
_ = rootCmd.RegisterFlagCompletionFunc(logLevelFlagName, common.AutocompleteLogLevel) _ = rootCmd.RegisterFlagCompletionFunc(logLevelFlagName, common.AutocompleteLogLevel)
pFlags.BoolVar(&debug, "debug", false, "Docker compatibility, force setting of log-level")
_ = pFlags.MarkHidden("debug")
// Only create these flags for ABI connections // Only create these flags for ABI connections
if !registry.IsRemote() { if !registry.IsRemote() {
runtimeflagFlagName := "runtime-flag" runtimeflagFlagName := "runtime-flag"

3
test/system/001-basic.bats
View File

@ -190,6 +190,9 @@ See 'podman version --help'" "podman version --remote"
run_podman --log-level=error info run_podman --log-level=error info
run_podman --log-level=fatal info run_podman --log-level=fatal info
run_podman --log-level=panic info run_podman --log-level=panic info
run_podman --debug info
run_podman 1 --debug --log-level=panic info
is "$output" "Setting --log-level and --debug is not allowed"
} }
# vim: filetype=sh # vim: filetype=sh