forked from M-Labs/artiq
logging: handle newlines in messages
This commit is contained in:
parent
6c856025cc
commit
f6fd7ecef2
|
@ -24,7 +24,9 @@ class LogBufferHandler(logging.Handler):
|
|||
|
||||
def emit(self, record):
|
||||
message = self.format(record)
|
||||
self.log_buffer.log(record.levelno, record.source, record.created, message)
|
||||
for part in message.split("\n"):
|
||||
self.log_buffer.log(record.levelno, record.source, record.created,
|
||||
part)
|
||||
|
||||
|
||||
def log_worker(rid, message):
|
||||
|
|
|
@ -101,16 +101,18 @@ class LogForwarder(logging.Handler, TaskObject):
|
|||
self.host = host
|
||||
self.port = port
|
||||
self.setFormatter(logging.Formatter(
|
||||
"%(source)s:%(levelno)d:%(name)s:%(message)s"))
|
||||
"%(name)s:%(message)s"))
|
||||
self._queue = asyncio.Queue(queue_size)
|
||||
self.reconnect_timer = reconnect_timer
|
||||
|
||||
def emit(self, record):
|
||||
message = self.format(record)
|
||||
for part in message.split("\n"):
|
||||
part = "{}:{}:{}".format(record.source, record.levelno, part)
|
||||
try:
|
||||
self._queue.put_nowait(message)
|
||||
self._queue.put_nowait(part)
|
||||
except asyncio.QueueFull:
|
||||
pass
|
||||
break
|
||||
|
||||
async def _do(self):
|
||||
while True:
|
||||
|
|
Loading…
Reference in New Issue