Changeset 1828
- Timestamp:
- 11/13/07 12:21:28
- Files:
-
- trunk/cherrypy/restsrv/plugins.py (modified) (1 diff)
- trunk/cherrypy/test/test_states.py (modified) (1 diff)
- trunk/cherrypy/test/test_states_demo.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/restsrv/plugins.py
r1826 r1828 412 412 self.bus.log("Restarting because %s changed." % filename) 413 413 self.thread.cancel() 414 self.bus.log("Stopped thread %r." % self.thread.getName()) 414 415 self.bus.restart() 415 416 return trunk/cherrypy/test/test_states.py
r1824 r1828 421 421 else: 422 422 tr = pyconquer.Logger("cherrypy") 423 tr.out = open(os.path.join(os.path.dirname(__file__), " state.log"), "wb")423 tr.out = open(os.path.join(os.path.dirname(__file__), "test_states_conquer.log"), "wb") 424 424 try: 425 425 tr.start() trunk/cherrypy/test/test_states_demo.py
r1827 r1828 76 76 cherrypy.config.update(conf) 77 77 cherrypy.tree.mount(Root(), config={'global': conf}) 78 cherrypy.engine.start() 78 try: 79 cherrypy.engine.start() 80 except ZeroDivisionError: 81 sys.exit(1) 79 82 cherrypy.engine.block()

