BF: always close sockets, don't double-close

Author: brunobeltran

pymatbridge/matlab/matlabserver.m

@@ -12,11 +12,7 @@ function matlabserver(socket_address, exit_when_done)
 json_startup;
 messenger('init', socket_address);
 
-if nargin > 1 && exit_when_done
-    c = onCleanup(@stop_messenger_and_exit);
-else
-    c = onCleanup(@stop_messenger);
-end
+c = onCleanup(@stop_messenger);
 
 while(1)
     msg_in = messenger('listen');
@@ -35,22 +31,21 @@ function matlabserver(socket_address, exit_when_done)
 
         case {'separate'}
             desktop; %no-op if desktop is already up
-            c = onCleanup(@stop_messenger);
             break;
 
         otherwise
-            messenger('respond', 'i dont know what you want');
+            messenger('respond', 'Unknown command recieved by matlabserver via ZMQ.');
 
     end
 end
 
-end %matlabserver
-
-function stop_messenger_and_exit()
-    messenger('exit');
+if nargin > 1 && exit_when_done
+    c.task();
     exit;
 end
 
+end %matlabserver
+
 function stop_messenger()
     messenger('exit');
 end

pymatbridge/messenger/src/messenger.c

@@ -143,8 +143,12 @@ void mexFunction(int nlhs, mxArray *plhs[],
         }
     /* Close the socket and context */
     } else if (strcmp(cmd, "exit") == 0) {
-        cleanup();
-        p[0] = 1;
+        if (initialized) {
+            cleanup();
+            p[0] = 1;
+        } else {
+            mexErrMsgTxt("No open socket to exit.");
+        }
     } else if (strcmp(cmd, "check") == 0) {
         if (initialized) {
             p[0] = 1;

pymatbridge/pymatbridge.py

@@ -241,8 +241,11 @@ def _response(self, **kwargs):
     def separate(self):
         if not self.started:
             raise ValueError('Session not started, use start()')
-        if self._response(cmd='separate') == 'exit':
-            self.logger.info("%s split off", self._program_name())
+        if self._response(cmd='separate') != 'exit':
+            raise ValueError('Failed to separate from {}'.format(self._program_name))
+        self.socket.close()
+        self.context.term()
+        self.logger.info("%s split off", self._program_name())
         self.started = False
         return True
 
@@ -252,9 +255,11 @@ def stop(self):
             return True
 
         # Matlab should respond with "exit" if successful
-        if self._response(cmd='exit') == "exit":
-            self.logger.info("%s closed", self._program_name())
-
+        if self._response(cmd='exit') != "exit":
+            raise ValueError("Failed to stop {}".format(self._program_name))
+        self.socket.close()
+        self.context.term()
+        self.logger.info("%s closed", self._program_name())
         self.started = False
         return True