jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-22 20:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix close async log handler (#5086)

Browse Source
This commit is contained in:
Pascal Vizeli 2016-12-29 17:27:58 +01:00 committed by Paulus Schoutsen
parent a2f17cccbb
commit 0ecd185f0d
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
homeassistant/util/logging.py
View File

@ -55,17 +55,10 @@ class AsyncHandler(object):
When blocking=True, will wait till closed. When blocking=True, will wait till closed.
""" """
if not self._thread.is_alive():
return
yield from self._queue.put(None) yield from self._queue.put(None)
if blocking: if blocking:
# Python 3.4.4+ while self._thread.is_alive():
# pylint: disable=no-member
if hasattr(self._queue, 'join'):
yield from self._queue.join()
else:
while not self._queue.empty():
yield from asyncio.sleep(0, loop=self.loop) yield from asyncio.sleep(0, loop=self.loop)
def emit(self, record): def emit(self, record):
@ -85,23 +78,15 @@ class AsyncHandler(object):
def _process(self): def _process(self):
"""Process log in a thread.""" """Process log in a thread."""
support_join = hasattr(self._queue, 'task_done')
while True: while True:
record = run_coroutine_threadsafe( record = run_coroutine_threadsafe(
self._queue.get(), self.loop).result() self._queue.get(), self.loop).result()
# pylint: disable=no-member
if record is None: if record is None:
self.handler.close() self.handler.close()
if support_join:
self.loop.call_soon_threadsafe(self._queue.task_done)
return return
self.handler.emit(record) self.handler.emit(record)
if support_join:
self.loop.call_soon_threadsafe(self._queue.task_done)
def createLock(self): def createLock(self):
"""Ignore lock stuff.""" """Ignore lock stuff."""