]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Force log lines to be interpreted as UTF-8
authorZack Cerza <zack@cerza.org>
Fri, 9 May 2014 15:45:01 +0000 (10:45 -0500)
committerZack Cerza <zack@cerza.org>
Fri, 9 May 2014 15:45:01 +0000 (10:45 -0500)
Any invalid UTF-8 byte will be replaced with a Unicode replacement
character: U+FFFD or '�'

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
teuthology/orchestra/run.py

index 547b8cadd3b12e8a816cd882350b7dfcffee7385..9d72ed628da1ef5a981e4a27337aca30eb5f7bb6 100644 (file)
@@ -123,6 +123,8 @@ def copy_to_log(f, logger, host, loglevel=logging.INFO):
     # api for now
     for line in f.xreadlines():
         line = line.rstrip()
+        # Second part of work-around for http://tracker.ceph.com/issues/8313
+        line = unicode(line, 'utf-8', 'replace').encode('utf-8')
         logger.log(loglevel, '[' + host + ']: ' + line)
 
 def copy_and_close(src, fdst):