split connecting to the server and listening to new connections into 2 methods

Author: robertbasic

pugdebug/debugger.py

@@ -159,12 +159,10 @@ def has_pending_connections(self):
         """
         return len(self.connections) > 0
 
-    def start_debug(self):
-        """Start a debugging session
-
-        If the server is not connected, connect it.
+    def start_listening(self):
+        """Start listening to new connections
         """
-        self.server.connect()
+        self.server.start_listening()
 
     def handle_server_connected(self, connection):
         """Handle when the server establishes a new connection

pugdebug/pugdebug.py

@@ -467,7 +467,7 @@ def start_listening(self):
 
             self.document_viewer.remove_line_highlights()
 
-            self.debugger.start_debug()
+            self.debugger.start_listening()
             self.main_window.set_debugging_status(1)
 
     def handle_debugging_started(self):

pugdebug/server.py

@@ -36,29 +36,41 @@ def __init__(self):
     def run(self):
         self.mutex.lock()
 
-        self.__connect()
+        socket_server = self.__connect()
+
+        if socket_server is not None:
+            self.__listen(socket_server)
 
         self.mutex.unlock()
 
-    def connect(self):
+    def start_listening(self):
         self.wait_for_accept = True
         self.start()
 
     def stop(self):
         self.wait_for_accept = False
 
     def __connect(self):
-        """Connect to the server and listen to new incomming connections
+        """Connect to the socket server
+        """
+        try:
+            socket_server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            socket_server.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+            socket_server.settimeout(1)
+        except OSError as e:
+            socket_server = None
+            self.server_error_signal.emit(e.strerror)
+
+        return socket_server
+
+    def __listen(self, socket_server):
+        """Listen to new incomming connections
 
         For every accepted connection, see if it is valid and emit a signal
         with that new connection.
 
         Otherwise silently disregard that connection.
         """
-        socket_server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        socket_server.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        socket_server.settimeout(1)
-
         host = get_setting('debugger/host')
         port_number = int(get_setting('debugger/port_number'))