Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-27 05:09:23 +01:00
Code Issues Projects Releases Wiki Activity

Catch more unicode-related exceptions when trying to write logs to a file.

Browse Source
This commit is contained in:
Valentin Lorentz 2016-02-09 18:39:55 +01:00
parent 6d4ea07b72
commit a538920df7
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/log.py
View File

@ -127,16 +127,14 @@ class StdoutStreamHandler(logging.StreamHandler):
class BetterFileHandler(logging.FileHandler): class BetterFileHandler(logging.FileHandler):
def emit(self, record): def emit(self, record):
msg = self.format(record) msg = self.format(record)
if not hasattr(types, "UnicodeType"): #if no unicode support... try:
self.stream.write(msg) self.stream.write(msg)
self.stream.write(os.linesep) except (UnicodeError, TypeError):
else:
try: try:
self.stream.write(msg)
self.stream.write(os.linesep)
except UnicodeError:
self.stream.write(msg.encode("utf8")) self.stream.write(msg.encode("utf8"))
self.stream.write(os.linesep) except (UnicodeError, TypeError):
self.stream.write(msg.encode("utf8").decode('ascii', 'replace'))
self.stream.write(os.linesep)
try: try:
self.flush() self.flush()
except OSError as e: except OSError as e: