Changeset 711
- Timestamp:
- 10/03/05 12:23:23
- Files:
-
- trunk/cherrypy/_cpserver.py (modified) (1 diff)
- trunk/cherrypy/lib/autoreload.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/_cpserver.py
r709 r711 99 99 except KeyboardInterrupt: 100 100 cherrypy.log("<Ctrl-C> hit: shutting down autoreloader", "HTTP") 101 self.stop() 102 except SystemExit: 103 cherrypy.log("SystemExit raised: shutting down autoreloader", "HTTP") 104 self.stop() 101 105 return 102 106 trunk/cherrypy/lib/autoreload.py
r661 r711 39 39 new_environ = os.environ.copy() 40 40 new_environ["RUN_MAIN"] = 'true' 41 exit_code = os.spawnve(os.P_WAIT, sys.executable, 42 args, new_environ) 41 exit_code = os.spawnve(os.P_WAIT, sys.executable, args, new_environ) 43 42 if exit_code != 3: 44 43 return exit_code … … 53 52 thread.start_new_thread(main_func, args, kwargs) 54 53 55 try: 56 reloader_thread() 57 except KeyboardInterrupt: 58 pass 54 # If KeyboardInterrupt is raised within reloader_thread, 55 # let it propagate out to the caller. 56 reloader_thread() 59 57 else: 60 58 # If KeyboardInterrupt is raised within restart_with_reloader,
