From: Eric Biagiotti <ebiagiotti@veritasgenetics.com>
Date: Wed, 9 Oct 2019 13:31:06 +0000 (-0400)
Subject: Merge branch '15655-logtail-encoding'
X-Git-Tag: 1.4.2^2~10
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/06eee168d874152bf90ba05c99aa5b7c69680c50?ds=sidebyside

Merge branch '15655-logtail-encoding'

refs #15655

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>
---

diff --git a/sdk/cwl/arvados_cwl/done.py b/sdk/cwl/arvados_cwl/done.py
index 9b26ad7064..806819afe2 100644
--- a/sdk/cwl/arvados_cwl/done.py
+++ b/sdk/cwl/arvados_cwl/done.py
@@ -70,7 +70,7 @@ def logtail(logcollection, logfunc, header, maxlen=25):
             logname = log[:-4]
             logt = deque([], maxlen)
             mergelogs[logname] = logt
-            with logcollection.open(log) as f:
+            with logcollection.open(log, encoding="utf-8") as f:
                 for l in f:
                     if containersapi:
                         g = timestamp_re.match(l)