Changeset 905
- Timestamp:
- 12/31/05 01:23:17
- Files:
-
- trunk/cherrypy/_cpserver.py (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/_cpserver.py
r904 r905 16 16 STARTED = 1 17 17 18 seen_threads = {}19 20 18 _missing = object() 21 19 … … 27 25 def __init__(self): 28 26 self.state = STOPPED 27 self.seen_threads = {} 29 28 30 29 self.httpserver = None … … 190 189 191 190 threadID = threading._get_ident() 192 if threadID not in se en_threads:191 if threadID not in self.seen_threads: 193 192 194 193 if cherrypy.codecoverage: … … 196 195 covercp.start() 197 196 198 i = len(se en_threads) + 1199 se en_threads[threadID] = i197 i = len(self.seen_threads) + 1 198 self.seen_threads[threadID] = i 200 199 201 200 for func in self.on_start_thread_list + self.onStartThreadList: … … 212 211 self.stop_http_server() 213 212 214 for thread_ident, i in se en_threads.iteritems():213 for thread_ident, i in self.seen_threads.iteritems(): 215 214 for func in self.on_stop_thread_list + self.onStopThreadList: 216 215 func(i) 217 se en_threads.clear()216 self.seen_threads.clear() 218 217 219 218 for func in self.on_stop_server_list + self.onStopServerList:

