projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14510: Setting collection cache wip
[arvados.git]
/
sdk
/
cwl
/
arvados_cwl
/
done.py
diff --git
a/sdk/cwl/arvados_cwl/done.py
b/sdk/cwl/arvados_cwl/done.py
index 7f3cb36de02c72d2fb9285bbc8c86c08a242e10f..6d46e79cb84b33bee3af508c86498201aa37acd1 100644
(file)
--- a/
sdk/cwl/arvados_cwl/done.py
+++ b/
sdk/cwl/arvados_cwl/done.py
@@
-57,8
+57,7
@@
timestamp_re = re.compile(r"^(\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d\.\d+Z) (.*)")
def logtail(logcollection, logfunc, header, maxlen=25):
if len(logcollection) == 0:
def logtail(logcollection, logfunc, header, maxlen=25):
if len(logcollection) == 0:
- logfunc(header)
- logfunc(" ** log is empty **")
+ logfunc("%s\n%s", header, " ** log is empty **")
return
containersapi = ("crunch-run.txt" in logcollection)
return
containersapi = ("crunch-run.txt" in logcollection)
@@
-95,6
+94,4
@@
def logtail(logcollection, logfunc, header, maxlen=25):
loglines = mergelogs.values()[0]
logtxt = "\n ".join(l.strip() for l in loglines)
loglines = mergelogs.values()[0]
logtxt = "\n ".join(l.strip() for l in loglines)
- logfunc(header)
- logfunc("\n %s", logtxt)
- return logtxt
+ logfunc("%s\n\n %s", header, logtxt)