Commits

Robert Brewer committed 7c1a83a

Added meaningful prefixes to names of threads started by CP.

Comments (0)

Files changed (2)

cherrypy/_cpserver.py

                 self.interrupt = exc
                 self.stop()
                 raise
-        threading.Thread(target=_start_http).start()
+        t = threading.Thread(target=_start_http)
+        t.setName("CPHTTPServer " + t.getName())
+        t.start()
         
         if blocking:
             self.wait_for_http_ready()
         def _callback(func, *args, **kwargs):
             self.wait()
             func(*args, **kwargs)
-        threading.Thread(target=_callback, args=args, kwargs=kwargs).start()
+        t = threading.Thread(target=_callback, args=args, kwargs=kwargs)
+        t.setName("CPServer Callback " + t.getName())
+        t.start()
         
         self.start(server_class = server_class)
 
             raise IOError("Port %s is in use on %s; perhaps the previous "
                           "server did not shut down properly." %
                           (repr(port), repr(host)))
-        except socket.error, msg:
+        except socket.error:
             if s:
                 s.close()
 

cherrypy/_cpwsgiserver.py

         for i in xrange(self.numthreads):
             self._workerThreads.append(WorkerThread(self))
         for worker in self._workerThreads:
+            worker.setName("CP WSGIServer " + worker.getName())
             worker.start()
         for worker in self._workerThreads:
             while not worker.ready:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.