X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1c6515a4445e9fd79961c9c8caf21528f16d9399..9045a0861e96a7c9f2717e9c5c34760cb3a30f66:/sdk/python/arvados/commands/ws.py diff --git a/sdk/python/arvados/commands/ws.py b/sdk/python/arvados/commands/ws.py index be48dc0cb9..347075dffd 100644 --- a/sdk/python/arvados/commands/ws.py +++ b/sdk/python/arvados/commands/ws.py @@ -14,7 +14,7 @@ def main(arguments=None): parser = argparse.ArgumentParser() parser.add_argument('-u', '--uuid', type=str, default="", help="Filter events on object_uuid") parser.add_argument('-f', '--filters', type=str, default="", help="Arvados query filter to apply to log events (JSON encoded)") - parser.add_argument('-s', '--start_time', type=str, default="", help="Arvados query filter to fetch log events created at or after this time. Allowed format: YYYY-MM-DD or YYYY-MM-DD hh:mm:ss") + parser.add_argument('-s', '--start-time', type=str, default="", help="Arvados query filter to fetch log events created at or after this time. This will be server time in UTC. Allowed format: YYYY-MM-DD or YYYY-MM-DD hh:mm:ss") group = parser.add_mutually_exclusive_group() group.add_argument('--poll-interval', default=15, type=int, help="If websockets is not available, specify the polling interval, default is every 15 seconds") @@ -62,8 +62,10 @@ def main(arguments=None): filters += [ ['object_uuid', '=', args.pipeline] ] if args.start_time: - args.last_log_id = 1 + last_log_id = 1 filters += [ ['created_at', '>=', args.start_time] ] + else: + last_log_id = None def on_message(ev): global filters @@ -90,7 +92,7 @@ def main(arguments=None): print json.dumps(ev) try: - ws = subscribe(arvados.api('v1'), filters, on_message, poll_fallback=args.poll_interval, last_log_id=args.last_log_id) + ws = subscribe(arvados.api('v1'), filters, on_message, poll_fallback=args.poll_interval, last_log_id=last_log_id) if ws: if args.pipeline: c = api.pipeline_instances().get(uuid=args.pipeline).execute()