Changeset 1537

Show
Ignore:
Timestamp:
06/11/08 23:59:14 (4 months ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/branches/0.7

    • Property svnmerge-integrated changed from /cherokee/trunk:1-1456,1460,1463,1465,1468,1482,1484,1486,1501,1532,1534 to /cherokee/trunk:1-1456,1460,1463,1465,1468,1482,1484,1486,1501,1532,1534-1535

  • cherokee/branches/0.7/ChangeLog

    r1536 r1537  
    112008-06-11  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
     2 
     3        * admin/server.py (main): Catch the KeyboardInterrupt exception 
     4        and print a nice exiting message instead of the default 
     5        back-trace.  Patch by Gunnar Wolf <gwolf@gwolf.org>. 
    26 
    37        * cherokee/main_admin.c (find_empty_port), admin/server.py (main): 

  • cherokee/branches/0.7/admin/server.py

    r1536 r1537  
    165165     
    166166    print ("Server running.. PID=%d" % (os.getpid())) 
    167     while True: 
    168         # Do it 
    169         srv.handle_request() 
     167 
     168    # Iterate until the user exists 
     169    try: 
     170        while True: 
     171            srv.handle_request() 
     172    except KeyboardInterrupt: 
     173        print "\rServer exiting.." 
    170174 
    171175    srv.server_close()