Changeset 1756
- Timestamp:
- 10/18/07 17:16:37
- Files:
-
- trunk/cherrypy/__init__.py (modified) (2 diffs)
- trunk/cherrypy/test/test_states_demo.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/__init__.py
r1752 r1756 190 190 class _TimeoutMonitor(restsrv.plugins.Monitor): 191 191 192 def __init__(self, engine):192 def __init__(self, bus): 193 193 self.servings = [] 194 restsrv.plugins.Monitor.__init__(self, engine, self.run)194 restsrv.plugins.Monitor.__init__(self, bus, self.run) 195 195 196 196 def acquire(self): … … 208 208 resp.check_timeout() 209 209 timeout_monitor = _TimeoutMonitor(engine) 210 timeout_monitor.subscribe() 210 211 211 212 # Add an autoreloader (the 'engine' config namespace may detach/attach it). 212 213 engine.autoreload = restsrv.plugins.Autoreloader(engine) 214 engine.autoreload.subscribe() 213 215 restsrv.plugins.Reexec(engine).subscribe() 214 216 restsrv.plugins.ThreadManager(engine).subscribe() trunk/cherrypy/test/test_states_demo.py
r1755 r1756 32 32 stop.exposed = True 33 33 34 34 35 if __name__ == '__main__': 35 36 conf = {"server.socket_host": sys.argv[1], … … 43 44 conf['server.ssl_certificate'] = serverpem 44 45 conf['server.ssl_private_key'] = serverpem 45 46 46 47 if '-daemonize' in sys.argv[3:]: 47 # Sometimes an exception happens during exit , try to make sure we get48 # a non_zero exit code.48 # Sometimes an exception happens during exit; 49 # try to make sure we get a non_zero exit code. 49 50 old_exitfunc = sys.exitfunc 50 51 def exitfunc(): … … 60 61 plugins.PIDFile(cherrypy.engine, PID_file_path).subscribe() 61 62 62 cherrypy.engine.subscribe('start', cherrypy.server.quickstart) 63 cherrypy.engine.subscribe('start', cherrypy.server.quickstart) 63 64 64 65 # This is in a special order for a reason:
