container/podman
container/podman
1
0
Fork 0
mirror of https://github.com/containers/podman synced 2024-10-20 09:13:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix duplicated logs command

Browse source 
Podman logs was defined twice, once for container logs and once for pod
logs. This causes problems with the shell completion. Also podman --help
showed this command twice.

[NO NEW TESTS NEEDED]

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger 2021-11-18 22:20:32 +01:00
parent 0376e6092c
commit 22ef7b6208
No known key found for this signature in database
GPG key ID: EB145DD938A3CAF2
2 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
cmd/podman/pods/logs.go
View file

@ -27,11 +27,11 @@ type logsOptionsWrapper struct {
var (
logsPodOptions logsOptionsWrapper
logsPodDescription = `Displays logs for pod with one or more containers.`
logsPodCommand = &cobra.Command{
podLogsCommand = &cobra.Command{
Use: "logs [options] POD",
Short: "Fetch logs for pod with one or more containers",
Long: logsPodDescription,
// We dont want users to invoke latest and pod togather
// We dont want users to invoke latest and pod together
Args: func(cmd *cobra.Command, args []string) error {
switch {
case registry.IsRemote() && logsPodOptions.Latest:
@ -53,35 +53,16 @@ var (
podman pod logs --follow=true --since 10m podID
podman pod logs mywebserver`,
}
containerLogsCommand = &cobra.Command{
Use: logsPodCommand.Use,
Short: logsPodCommand.Short,
Long: logsPodCommand.Long,
Args: logsPodCommand.Args,
RunE: logsPodCommand.RunE,
ValidArgsFunction: logsPodCommand.ValidArgsFunction,
Example: `podman pod logs podId
podman pod logs -c ctrname podName
podman pod logs --tail 2 mywebserver
podman pod logs --follow=true --since 10m podID`,
}
)
func init() {
// pod logs
registry.Commands = append(registry.Commands, registry.CliCommand{
Command: logsPodCommand,
})
logsFlags(logsPodCommand)
validate.AddLatestFlag(logsPodCommand, &logsPodOptions.Latest)
// container logs
registry.Commands = append(registry.Commands, registry.CliCommand{
Command: containerLogsCommand,
Command: podLogsCommand,
Parent: podCmd,
})
logsFlags(containerLogsCommand)
validate.AddLatestFlag(containerLogsCommand, &logsPodOptions.Latest)
logsFlags(podLogsCommand)
validate.AddLatestFlag(podLogsCommand, &logsPodOptions.Latest)
}
func logsFlags(cmd *cobra.Command) {

7
hack/xref-helpmsgs-manpages
View file

@ -242,6 +242,13 @@ sub podman_help {
if ($line =~ /^\s{1,4}(\S+)\s/) {
my $subcommand = $1;
print "> podman @_ $subcommand\n" if $debug;
# check that the same subcommand is not listed twice (#12356)
if (exists $help{$subcommand}) {
warn "$ME: 'podman @_ help' lists '$subcommand' twice\n";
++$Errs;
}
$help{$subcommand} = podman_help(@_, $subcommand)
unless $subcommand eq 'help'; # 'help' not in man
}