fix: add further session closed checks

alandtse · May 12, 2020 · 118f644 · 118f644
1 parent 7bf4139
commit 118f644
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/custom_components/alexa_media/__init__.py b/custom_components/alexa_media/__init__.py
@@ -250,6 +250,7 @@ async def async_update_data():
         if (
             email not in hass.data[DATA_ALEXAMEDIA]["accounts"]
             or "login_successful" not in login_obj.status
+            or login_obj.session.closed
         ):
             return
         existing_serials = _existing_serials(hass, login_obj)
@@ -577,6 +578,12 @@ async def ws_connect() -> WebsocketEchoClient:
         """
         websocket: Optional[WebsocketEchoClient] = None
         try:
+            if login_obj.session.closed:
+                _LOGGER.debug(
+                    "%s: Websocket creation aborted. Session is closed.",
+                    hide_email(email),
+                )
+                return
             websocket = WebsocketEchoClient(
                 login_obj,
                 ws_handler,
@@ -853,7 +860,7 @@ async def ws_error_handler(message):
             type(message),
         )
         hass.data[DATA_ALEXAMEDIA]["accounts"][email]["websocket"] = None
-        if message == "<class 'aiohttp.streams.EofStream'>":
+        if login_obj.session.closed or message == "<class 'aiohttp.streams.EofStream'>":
             hass.data[DATA_ALEXAMEDIA]["accounts"][email]["websocketerror"] = 5
             _LOGGER.debug("%s: Immediate abort on EoFstream", hide_email(email))
             return
@@ -937,7 +944,7 @@ async def close_connections(hass, email: Text) -> None:
     login_obj = account_dict["login_obj"]
     await login_obj.close()
     _LOGGER.debug(
-        "%s: Connection closed: %s", hide_email(email), login_obj._session.closed
+        "%s: Connection closed: %s", hide_email(email), login_obj.session.closed
     )
     await clear_configurator(hass, email)