evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix memory leak in websocket_api (#42894)

Browse source 
* Fix memory leak in websocket_api

Each named logger lives forever

* tweak
This commit is contained in:
J. Nick Koston 2020-11-05 22:27:41 -10:00 • committed by GitHub
parent 1e87ac7eda
commit 3c84c7ccf0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
homeassistant/components/websocket_api/http.py
View file

@ -27,6 +27,7 @@ from .error import Disconnect
from .messages import message_to_json from .messages import message_to_json
# mypy: allow-untyped-calls, allow-untyped-defs, no-check-untyped-defs # mypy: allow-untyped-calls, allow-untyped-defs, no-check-untyped-defs
_WS_LOGGER = logging.getLogger(f"{__name__}.connection")
class WebsocketAPIView(HomeAssistantView): class WebsocketAPIView(HomeAssistantView):
@ -41,6 +42,14 @@ class WebsocketAPIView(HomeAssistantView):
return await WebSocketHandler(request.app["hass"], request).async_handle() return await WebSocketHandler(request.app["hass"], request).async_handle()
class WebSocketAdapter(logging.LoggerAdapter):
"""Add connection id to websocket messages."""
def process(self, msg, kwargs):
"""Add connid to websocket log messages."""
return f'[{self.extra["connid"]}] {msg}', kwargs
class WebSocketHandler: class WebSocketHandler:
"""Handle an active websocket client connection.""" """Handle an active websocket client connection."""
@ -52,7 +61,7 @@ class WebSocketHandler:
self._to_write: asyncio.Queue = asyncio.Queue(maxsize=MAX_PENDING_MSG) self._to_write: asyncio.Queue = asyncio.Queue(maxsize=MAX_PENDING_MSG)
self._handle_task = None self._handle_task = None
self._writer_task = None self._writer_task = None
self._logger = logging.getLogger("{}.connection.{}".format(__name__, id(self))) self._logger = WebSocketAdapter(_WS_LOGGER, {"connid": id(self)})
self._peak_checker_unsub = None self._peak_checker_unsub = None
async def _writer(self): async def _writer(self):