From c7a9dc32e0bcd92097775aadf48d42d630917544 Mon Sep 17 00:00:00 2001 From: Chih-Hsuan Yen Date: Sat, 20 Nov 2021 18:38:48 +0800 Subject: [PATCH] Correctly handle the timezone in batch job logs (#4604) --- moto/batch/models.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/moto/batch/models.py b/moto/batch/models.py index 79928df23..f6c0b9d55 100644 --- a/moto/batch/models.py +++ b/moto/batch/models.py @@ -583,7 +583,11 @@ class Job(threading.Thread, BaseModel, DockerModel): logs = [] for line in logs_stdout + logs_stderr: date, line = line.split(" ", 1) - date_obj = dateutil.parser.parse(date, ignoretz=True) + date_obj = ( + dateutil.parser.parse(date) + .astimezone(datetime.timezone.utc) + .replace(tzinfo=None) + ) date = unix_time_millis(date_obj) logs.append({"timestamp": date, "message": line.strip()})