From 2f2e398e5f4f14b93b769ece4b9810024ca15b0c Mon Sep 17 00:00:00 2001 From: pavel-shirshov Date: Wed, 21 Feb 2018 00:32:29 -0800 Subject: [PATCH] Add support for additional timestamp format (#474) --- ansible/library/extract_log.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/ansible/library/extract_log.py b/ansible/library/extract_log.py index 7b7d1af0e2..d415097199 100644 --- a/ansible/library/extract_log.py +++ b/ansible/library/extract_log.py @@ -109,14 +109,18 @@ def extract_number(s): def convert_date(s): - str_date = re.findall(r'^\S{3}\s{1,2}\d{1,2} \d{2}:\d{2}:\d{2}\.?\d*', s)[0] dt = None - try: - dt = datetime.strptime(str_date, '%b %d %X.%f') - except ValueError: - pass - if dt is None: - dt = datetime.strptime(str_date, '%b %d %X') + re_result = re.findall(r'^\S{3}\s{1,2}\d{1,2} \d{2}:\d{2}:\d{2}\.?\d*', s) + if len(re_result) > 0: + str_date = re_result[0] + try: + dt = datetime.strptime(str_date, '%b %d %X.%f') + except ValueError: + dt = datetime.strptime(str_date, '%b %d %X') + else: + re_result = re.findall(r'^\d{4}-\d{2}-\d{2}\.\d{2}:\d{2}:\d{2}\.\d{6}', s) + str_date = re_result[0] + dt = datetime.strptime(str_date, '%Y-%m-%d.%X.%f') return dt