Merge pull request #120 from robertbasic/fix/issue117

Fix/issue117. Fixes #117 and fixes #9

Author: robertbasic

pugdebug/debugger.py

@@ -64,6 +64,9 @@ def connect_server_signals(self):
         self.server.server_stopped_signal.connect(
             self.handle_server_stopped
         )
+        self.server.server_error_signal.connect(
+            self.handle_server_error
+        )
 
     def connect_connection_signals(self, connection):
         """Connect signals for a new connection
@@ -119,6 +122,11 @@ def connect_connection_signals(self, connection):
             self.handle_expressions_evaluated
         )
 
+        # Error signals
+        connection.connection_error_signal.connect(
+            self.handle_connection_error
+        )
+
     def cleanup(self):
         """Cleanup debugger when it's done
 
@@ -309,6 +317,17 @@ def handle_expressions_evaluated(self, results):
         """Handle when server evaluates a list of expressions"""
         self.expressions_evaluated_signal.emit(results)
 
+    def handle_server_error(self, error):
+        self.error_signal.emit(error)
+
+    def handle_connection_error(self, action, error):
+        error = error + " during %s action" % action
+        self.error_signal.emit(error)
+
+        # The current connection is FUBAR so just set it to None
+        self.current_connection = None
+        self.stop_debug()
+
     def get_current_file(self):
         if 'filename' in self.step_result:
             self.current_file = self.step_result['filename']

pugdebug/server.py

@@ -119,6 +119,8 @@ class PugdebugServerConnection(QThread):
     expression_evaluated_signal = pyqtSignal(int, dict)
     expressions_evaluated_signal = pyqtSignal(list)
 
+    connection_error_signal = pyqtSignal(str, str)
+
     def __init__(self, socket):
         super(PugdebugServerConnection, self).__init__()
 
@@ -179,48 +181,52 @@ def run(self):
         data = self.data
         action = self.action
 
-        if action == 'stop':
-            response = self.__stop()
-            self.stopped_signal.emit()
-        elif action == 'detach':
-            response = self.__detach()
-            self.detached_signal.emit()
-        elif action == 'step_run':
-            response = self.__step_run()
-            self.stepped_signal.emit(response)
-        elif action == 'step_into':
-            response = self.__step_into()
-            self.stepped_signal.emit(response)
-        elif action == 'step_over':
-            response = self.__step_over()
-            self.stepped_signal.emit(response)
-        elif action == 'step_out':
-            response = self.__step_out()
-            self.stepped_signal.emit(response)
-        elif action == 'post_step':
-            response = self.__post_step(data)
-
-            self.got_variables_signal.emit(response['variables'])
-            self.got_stacktraces_signal.emit(response['stacktraces'])
-            self.expressions_evaluated_signal.emit(
-                response['expressions']
-            )
-        elif action == 'init_breakpoint_set':
-            response = self.__set_init_breakpoints(data)
-            self.set_init_breakpoints_signal.emit(response)
-        elif action == 'breakpoint_set':
-            response = self.__set_breakpoint(data)
-            self.set_breakpoint_signal.emit(response)
-        elif action == 'breakpoint_remove':
-            response = self.__remove_breakpoint(data)
-            self.removed_breakpoint_signal.emit(response)
-        elif action == 'breakpoint_list':
-            response = self.__list_breakpoints()
-            self.listed_breakpoints_signal.emit(response)
-        elif action == 'evaluate_expression':
-            (index, expression) = data
-            response = self.__evaluate_expression(expression)
-            self.expression_evaluated_signal.emit(index, response)
+        try:
+            if action == 'stop':
+                response = self.__stop()
+                self.stopped_signal.emit()
+            elif action == 'detach':
+                response = self.__detach()
+                self.detached_signal.emit()
+            elif action == 'step_run':
+                response = self.__step_run()
+                self.stepped_signal.emit(response)
+            elif action == 'step_into':
+                response = self.__step_into()
+                self.stepped_signal.emit(response)
+            elif action == 'step_over':
+                response = self.__step_over()
+                self.stepped_signal.emit(response)
+            elif action == 'step_out':
+                response = self.__step_out()
+                self.stepped_signal.emit(response)
+            elif action == 'post_step':
+                response = self.__post_step(data)
+
+                self.got_variables_signal.emit(response['variables'])
+                self.got_stacktraces_signal.emit(response['stacktraces'])
+                self.expressions_evaluated_signal.emit(
+                    response['expressions']
+                )
+            elif action == 'init_breakpoint_set':
+                response = self.__set_init_breakpoints(data)
+                self.set_init_breakpoints_signal.emit(response)
+            elif action == 'breakpoint_set':
+                response = self.__set_breakpoint(data)
+                self.set_breakpoint_signal.emit(response)
+            elif action == 'breakpoint_remove':
+                response = self.__remove_breakpoint(data)
+                self.removed_breakpoint_signal.emit(response)
+            elif action == 'breakpoint_list':
+                response = self.__list_breakpoints()
+                self.listed_breakpoints_signal.emit(response)
+            elif action == 'evaluate_expression':
+                (index, expression) = data
+                response = self.__evaluate_expression(expression)
+                self.expression_evaluated_signal.emit(index, response)
+        except OSError as error:
+            self.disconnect()
+            self.connection_error_signal.emit(action, error.strerror)
 
         self.mutex.unlock()