Merge #13440: qa: Log as utf-8

fa8071a098 qa: Log as utf-8 (MarcoFalke)

Pull request description:

  Explicitly read and write the log files with utf-8 as encoding

Tree-SHA512: ca28f37f34a09845c736ff6c4c21733c3c39584f52c81e48ff25e5e35979c317d0989862b2b93acc7e359fbcc20b99533365455830b2ddb41eb4d8c17314534e
This commit is contained in:
Wladimir J. van der Laan 2018-06-12 14:52:26 +02:00
commit 5315660bae
No known key found for this signature in database
GPG key ID: 1E4AED62986CD25D
2 changed files with 2 additions and 2 deletions

View file

@ -63,7 +63,7 @@ def get_log_events(source, logfile):
Log events may be split over multiple lines. We use the timestamp Log events may be split over multiple lines. We use the timestamp
regex match as the marker for a new log event.""" regex match as the marker for a new log event."""
try: try:
with open(logfile, 'r') as infile: with open(logfile, 'r', encoding='utf-8') as infile:
event = '' event = ''
timestamp = '' timestamp = ''
for line in infile: for line in infile:

View file

@ -359,7 +359,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
self.log = logging.getLogger('TestFramework') self.log = logging.getLogger('TestFramework')
self.log.setLevel(logging.DEBUG) self.log.setLevel(logging.DEBUG)
# Create file handler to log all messages # Create file handler to log all messages
fh = logging.FileHandler(self.options.tmpdir + '/test_framework.log') fh = logging.FileHandler(self.options.tmpdir + '/test_framework.log', encoding='utf-8')
fh.setLevel(logging.DEBUG) fh.setLevel(logging.DEBUG)
# Create console handler to log messages to stderr. By default this logs only error messages, but can be configured with --loglevel. # Create console handler to log messages to stderr. By default this logs only error messages, but can be configured with --loglevel.
ch = logging.StreamHandler(sys.stdout) ch = logging.StreamHandler(sys.stdout)