X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e7672a0b679659d6ba90d23b4e102fba747fa9ef..eb58fd945645f5a670c761f7046b10885941167e:/sdk/cwl/arvados_cwl/done.py diff --git a/sdk/cwl/arvados_cwl/done.py b/sdk/cwl/arvados_cwl/done.py index 48466f00c2..6d46e79cb8 100644 --- a/sdk/cwl/arvados_cwl/done.py +++ b/sdk/cwl/arvados_cwl/done.py @@ -1,3 +1,7 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + import re from cwltool.errors import WorkflowException from collections import deque @@ -51,10 +55,9 @@ def done_outputs(self, record, tmpdir, outdir, keepdir): 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): +def logtail(logcollection, logfunc, header, maxlen=25): if len(logcollection) == 0: - logger.info(header) - logger.info(" ** log is empty **") + logfunc("%s\n%s", header, " ** log is empty **") return containersapi = ("crunch-run.txt" in logcollection) @@ -91,5 +94,4 @@ def logtail(logcollection, logger, header, maxlen=25): loglines = mergelogs.values()[0] logtxt = "\n ".join(l.strip() for l in loglines) - logger.info(header) - logger.info("\n %s", logtxt) + logfunc("%s\n\n %s", header, logtxt)