Changeset 1652
- Timestamp:
- 05/02/07 00:19:17
- Files:
-
- trunk/cherrypy/_cpmodpy.py (modified) (2 diffs)
- trunk/cherrypy/lib/sessions.py (modified) (1 diff)
- trunk/cherrypy/restsrv/plugins.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/_cpmodpy.py
r1627 r1652 22 22 'log.screen': False, 23 23 'show_tracebacks': False}) 24 25 # Turn off the builtin signal handlers, which can interact 26 # in strange ways with the Apache process. 27 cherrypy.engine.SIGHUP = None 28 cherrypy.engine.SIGTERM = None 29 24 30 # You must start the engine in a non-blocking fashion 25 31 # so that mod_python can proceed … … 47 53 # End 48 54 49 The actual path to your mod_python.so is depend ant ofyour55 The actual path to your mod_python.so is dependent on your 50 56 environment. In this case we suppose a global mod_python 51 57 installation on a Linux distribution such as Ubuntu. trunk/cherrypy/lib/sessions.py
r1639 r1652 448 448 cherrypy._serving.session = sess = globals()[storage_class](id, **kwargs) 449 449 450 # Create cherrypy.session which will proxy to cherrypy._serving.session 450 451 if not hasattr(cherrypy, "session"): 451 452 cherrypy.session = cherrypy._ThreadLocalProxy('session') trunk/cherrypy/restsrv/plugins.py
r1651 r1652 378 378 'start_thread' and 'stop_thread' listeners in the engine as needed. 379 379 380 If threads are created and destroyed by code you do not control (e.g., 381 Apache), then, at the beginning of every HTTP request, publish to 382 'acquire_thread' only. You should not publish to 'release_thread' in 383 this case, since you do not know whether the thread will be re-used or 384 not. The engine will call 'stop_thread' listeners for you when it stops. 380 If threads are created and destroyed by code you do not control 381 (e.g., Apache), then, at the beginning of every HTTP request, 382 publish to 'acquire_thread' only. You should not publish to 383 'release_thread' in this case, since you do not know whether 384 the thread will be re-used or not. The engine will call 385 'stop_thread' listeners for you when it stops. 385 386 """ 386 387 … … 394 395 395 396 def acquire(self): 396 """Run 'start_thread' listeners for the current thread. Idempotent.""" 397 """Run 'start_thread' listeners for the current thread. 398 399 If the current thread has already been seen, any 'start_thread' 400 listeners will not be run again. 401 """ 397 402 thread_ident = threading._get_ident() 398 403 if thread_ident not in self.threads:
