Handle socket errors properly.

Author: Mike Stegeman

gateway_addon/adapter.py

@@ -34,6 +34,10 @@ def __init__(self, _id, package_name, verbose=False):
                                                verbose=verbose)
         self.manager_proxy.add_adapter(self)
 
+    def close_proxy(self):
+        """Close the manager proxy."""
+        self.manager_proxy.close()
+
     def dump(self):
         """Dump the state of the adapter to the log."""
         print('Adapter:', self.name, '- dump() not implemented')

gateway_addon/addon_manager_proxy.py

@@ -1,5 +1,6 @@
 """Proxy for sending messages between the Gateway and an add-on."""
 
+from nnpy.errors import NNError
 import json
 import threading
 
@@ -26,12 +27,17 @@ def __init__(self, socket, plugin_id, verbose=False):
         self.verbose = verbose
         self.running = True
         self.thread = threading.Thread(target=self.recv)
+        self.thread.daemon = True
         self.thread.start()
 
     def close(self):
         """Close the proxy."""
         self.running = False
-        self.socket.close()
+
+        try:
+            self.socket.close()
+        except NNError:
+            pass
 
     def add_adapter(self, adapter):
         """
@@ -99,15 +105,23 @@ def send(self, msg_type, data):
 
         data['pluginId'] = self.plugin_id
 
-        self.socket.send(json.dumps({
-            'messageType': msg_type,
-            'data': data,
-        }))
+        try:
+            self.socket.send(json.dumps({
+                'messageType': msg_type,
+                'data': data,
+            }))
+        except NNError as e:
+            print('AddonManagerProxy: Failed to send message: {}'.format(e))
 
     def recv(self):
         """Read a message from the IPC socket."""
         while self.running:
-            msg = self.socket.recv()
+            try:
+                msg = self.socket.recv()
+            except NNError as e:
+                print('AddonManagerProxy: Error receiving message from '
+                      'socket: {}'.format(e))
+                break
 
             if self.verbose:
                 print('AddonMangerProxy: recv:', msg)

gateway_addon/ipc.py

@@ -1,5 +1,6 @@
 """IPC client to communicate with the Gateway."""
 
+from nnpy.errors import NNError
 import json
 import nnpy
 
@@ -24,14 +25,23 @@ def __init__(self, plugin_id, verbose=False):
         if verbose:
             print('IpcClient: Connected to server, registering...')
 
-        self.manager_socket.send(json.dumps({
-            'messageType': 'registerPlugin',
-            'data': {
-                'pluginId': plugin_id,
-            }
-        }))
+        try:
+            self.manager_socket.send(json.dumps({
+                'messageType': 'registerPlugin',
+                'data': {
+                    'pluginId': plugin_id,
+                }
+            }))
+        except NNError as e:
+            print('IpcClient: Failed to send message: {}'.format(e))
+            return
+
+        try:
+            resp = self.manager_socket.recv()
+        except NNError as e:
+            print('IpcClient: Error receiving message: {}'.format(e))
+            return
 
-        resp = self.manager_socket.recv()
         if verbose:
             print('IpcClient: Received manager message:', resp)