X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Fclient%2Fconnection.py;h=3ee8f16c914bc7052f4583f41b02de6b4470a7b6;hb=65d71ab71ce1aaf9ca3aeeee7dd6cb8793278b3e;hp=82ec4faf8123f5581a655f54b66683e8604ebdc0;hpb=afd9bf49afc5025f3b668fd3a09b0275d7edc382;p=osm%2FN2VC.git

diff --git a/juju/client/connection.py b/juju/client/connection.py
index 82ec4fa..3ee8f16 100644
--- a/juju/client/connection.py
+++ b/juju/client/connection.py
@@ -84,14 +84,24 @@ class Connection:
         await self.ws.close()
 
     async def recv(self, request_id):
+        if not self.is_open:
+            raise websockets.exceptions.ConnectionClosed(0, 'websocket closed')
         return await self.messages.get(request_id)
 
     async def receiver(self):
         while self.is_open:
-            result = await self.ws.recv()
-            if result is not None:
-                result = json.loads(result)
-                await self.messages.put(result['request-id'], result)
+            try:
+                result = await self.ws.recv()
+                if result is not None:
+                    result = json.loads(result)
+                    await self.messages.put(result['request-id'], result)
+            except Exception as e:
+                await self.messages.put_all(e)
+                if isinstance(e, websockets.ConnectionClosed):
+                    # ConnectionClosed is not really exceptional for us,
+                    # but it may be for any pending message listeners
+                    return
+                raise
 
     async def rpc(self, msg, encoder=None):
         self.__request_id__ += 1
@@ -111,7 +121,7 @@ class Connection:
             # API Error Response
             raise JujuAPIError(result)
 
-        if not 'response' in result:
+        if 'response' not in result:
             # This may never happen
             return result