Download Install Tutorial Docs FAQ Tools WikiLicense Team IRC Planet Involvement Shop Book

Changeset 905

Show
Ignore:
Timestamp:
12/31/05 01:23:17
Author:
fumanchu
Message:

seen_threads really should belong to the Server class.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/cherrypy/_cpserver.py

    r904 r905  
    1616STARTED = 1 
    1717 
    18 seen_threads = {} 
    19  
    2018_missing = object() 
    2119 
     
    2725    def __init__(self): 
    2826        self.state = STOPPED 
     27        self.seen_threads = {} 
    2928         
    3029        self.httpserver = None 
     
    190189         
    191190        threadID = threading._get_ident() 
    192         if threadID not in seen_threads: 
     191        if threadID not in self.seen_threads: 
    193192             
    194193            if cherrypy.codecoverage: 
     
    196195                covercp.start() 
    197196             
    198             i = len(seen_threads) + 1 
    199             seen_threads[threadID] = i 
     197            i = len(self.seen_threads) + 1 
     198            self.seen_threads[threadID] = i 
    200199             
    201200            for func in self.on_start_thread_list + self.onStartThreadList: 
     
    212211        self.stop_http_server() 
    213212         
    214         for thread_ident, i in seen_threads.iteritems(): 
     213        for thread_ident, i in self.seen_threads.iteritems(): 
    215214            for func in self.on_stop_thread_list + self.onStopThreadList: 
    216215                func(i) 
    217         seen_threads.clear() 
     216        self.seen_threads.clear() 
    218217         
    219218        for func in self.on_stop_server_list + self.onStopServerList: 

Hosted by WebFaction

Log in as guest/cpguest to create tickets