From e367f2eea8974cc137b2c74bfbfcf0e5d334f15f Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Fri, 30 Dec 2016 13:34:27 -0500 Subject: [PATCH] 10497: Replace \d\d\d\d with \d{4} --- sdk/cwl/arvados_cwl/done.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/cwl/arvados_cwl/done.py b/sdk/cwl/arvados_cwl/done.py index 7abaedf89c..87908c28ce 100644 --- a/sdk/cwl/arvados_cwl/done.py +++ b/sdk/cwl/arvados_cwl/done.py @@ -44,8 +44,8 @@ def done_outputs(self, record, tmpdir, outdir, keepdir): self.builder.pathmapper.keepdir = keepdir return self.collect_outputs("keep:" + record["output"]) -crunchstat_re = re.compile(r"^\d\d\d\d-\d\d-\d\d_\d\d:\d\d:\d\d [a-z0-9]{5}-8i9sb-[a-z0-9]{15} \d+ \d+ stderr crunchstat:") -timestamp_re = re.compile(r"^(\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d\.\d+Z) (.*)") +crunchstat_re = re.compile(r"^\d{4}-\d\d-\d\d_\d\d:\d\d:\d\d [a-z0-9]{5}-8i9sb-[a-z0-9]{15} \d+ \d+ stderr crunchstat:") +timestamp_re = re.compile(r"^(\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d\.\d+Z) (.*)") def logtail(logcollection, logger, header, maxlen=25): logtail = deque([], maxlen*len(logcollection)) -- 2.30.2