M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

protocols/logging/LogParser: handle Windows CRLF

This commit is contained in:
Sebastien Bourdeauducq 2016-01-27 20:45:04 +01:00
parent 590354dbc8
commit 170b438b98
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/protocols/logging.py
View File

@ -78,7 +78,7 @@ class LogParser:
entry = (await stream.readline()) entry = (await stream.readline())
if not entry: if not entry:
break break
self.line_input(entry[:-1].decode()) self.line_input(entry.decode().rstrip("\r\n"))
except: except:
logger.debug("exception in log forwarding", exc_info=True) logger.debug("exception in log forwarding", exc_info=True)
break break