Source

CherryPyFixTicketUrls2 / _cpserver.py

Diff from to

File _cpserver.py

         self.httpservers = {}
         self.interrupt = None
     
-    def start(self, server=None):
-        """Main function. MUST be called from the main thread."""
-        self.interrupt = None
+    def quickstart(self, server=None):
+        """Main function for quick starts. MUST be called from the main thread.
+        
+        This function works like CherryPy 2's server.start(). It loads and
+        starts an httpserver based on the given server object, if any, and
+        config entries.
+        """
         httpserver, bind_addr = self.httpserver_from_config(server)
         self.httpservers[httpserver] = bind_addr
-        self._start_http(httpserver)
+        self.start()
     
     def httpserver_from_config(self, httpserver=None):
         """Return a (httpserver, bind_addr) pair based on config settings."""
         else:
             return httpserver, conf('server.socket_file')
     
-    def start_all(self):
+    def start(self):
         """Start all registered HTTP servers."""
+        self.interrupt = None
         for httpserver in self.httpservers:
             self._start_http(httpserver)
     
     def restart(self):
         """Restart the HTTP server."""
         self.stop()
-        self.interrupt = None
-        self.start_all()
+        self.start()
 
 
 def check_port(host, port):