holm/podman-compose
1
0
Fork 0
forked from extern/podman-compose
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing arguments to the log (latest, names, since, until)

Browse Source
This commit is contained in:
Avi Duda 2021-12-13 21:41:07 +01:00 committed by Muayyad Alsadi
parent 724d2fd18c
commit 6c1ccfcefa
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
podman_compose.py
View File

@ -1575,7 +1575,7 @@ def compose_restart(compose, args):
@cmd_run(podman_compose, 'logs', 'show logs from services') @cmd_run(podman_compose, 'logs', 'show logs from services')
def compose_logs(compose, args): def compose_logs(compose, args):
container_names_by_service = compose.container_names_by_service container_names_by_service = compose.container_names_by_service
if not args.services: if not args.services and not args.latest:
args.services = container_names_by_service.keys() args.services = container_names_by_service.keys()
targets = [] targets = []
for service in args.services: for service in args.services:
@ -1585,12 +1585,20 @@ def compose_logs(compose, args):
podman_args = [] podman_args = []
if args.follow: if args.follow:
podman_args.append('-f') podman_args.append('-f')
if args.latest:
podman_args.append("-l")
if args.names:
podman_args.append('-n')
if args.since:
podman_args.extend(['--since', args.since])
# the default value is to print all logs which is in podman = 0 and not # the default value is to print all logs which is in podman = 0 and not
# needed to be passed # needed to be passed
if args.tail and args.tail != 'all': if args.tail and args.tail != 'all':
podman_args.extend(['--tail', args.tail]) podman_args.extend(['--tail', args.tail])
if args.timestamps: if args.timestamps:
podman_args.append('-t') podman_args.append('-t')
if args.until:
podman_args.extend(['--until', args.until])
for target in targets: for target in targets:
podman_args.append(target) podman_args.append(target)
compose.podman.run([], 'logs', podman_args) compose.podman.run([], 'logs', podman_args)
@ -1704,13 +1712,21 @@ def compose_parse_timeout(parser):
@cmd_parse(podman_compose, ['logs']) @cmd_parse(podman_compose, ['logs'])
def compose_logs_parse(parser): def compose_logs_parse(parser):
parser.add_argument("-f", "--follow", action='store_true', parser.add_argument("-f", "--follow", action='store_true',
help="Follow log output.") help="Follow log output. The default is false")
parser.add_argument("-l", "--latest", action='store_true',
help="Act on the latest container podman is aware of")
parser.add_argument("-n", "--names", action='store_true',
help="Output the container name in the log")
parser.add_argument("--since", help="Show logs since TIMESTAMP",
type=str, default=None)
parser.add_argument("-t", "--timestamps", action='store_true', parser.add_argument("-t", "--timestamps", action='store_true',
help="Show timestamps.") help="Show timestamps.")
parser.add_argument("--tail", parser.add_argument("--tail",
help="Number of lines to show from the end of the logs for each " help="Number of lines to show from the end of the logs for each "
"container.", "container.",
type=str, default="all") type=str, default="all")
parser.add_argument("--until", help="Show logs until TIMESTAMP",
type=str, default=None)
parser.add_argument('services', metavar='services', nargs='*', default=None, parser.add_argument('services', metavar='services', nargs='*', default=None,
help='service names') help='service names')