Fixed intermittent cryptonas-server crash at startup
This commit is contained in:
parent
e862e16a59
commit
b5003220b9
2 changed files with 39 additions and 20 deletions
|
@ -1,20 +1,16 @@
|
|||
--- chroot/usr/share/python-support/python-cherrypy/cherrypy/_cpwsgiserver.py 2006-04-24 18:37:45.000000000 -0700
|
||||
+++ chroot/usr/share/cryptonas-live/_cpwsgiserver-copy.py 2008-11-27 22:53:49.000000000 -0700
|
||||
@@ -200,10 +200,17 @@
|
||||
response = request.wsgi_app(request.environ,
|
||||
request.start_response)
|
||||
for line in response:
|
||||
request.write(line)
|
||||
except socket.error, e:
|
||||
+ msg = e.args[1]
|
||||
+ if msg == "Bad file descriptor":
|
||||
+ # Our socket was closed
|
||||
+ return
|
||||
+ if msg == "Resource temporarily unavailable":
|
||||
+ # Just try again. See http://www.cherrypy.org/ticket/479.
|
||||
+ return
|
||||
errno = e.args[0]
|
||||
if errno not in socket_errors_to_ignore:
|
||||
traceback.print_exc()
|
||||
except (KeyboardInterrupt, SystemExit), exc:
|
||||
self.server.interrupt = exc
|
||||
--- chroot/usr/share/python-support/python-cherrypy/cherrypy/_cpwsgiserver.py.old 2011-01-20 22:07:45.000000000 -0700
|
||||
+++ chroot/usr/share/python-support/python-cherrypy/cherrypy/_cpwsgiserver.py.new 2011-01-04 23:50:26.000000000 -0700
|
||||
@@ -409,10 +412,13 @@
|
||||
# Our socket was closed
|
||||
return
|
||||
if msg == "Resource temporarily unavailable":
|
||||
# Just try again. See http://www.cherrypy.org/ticket/479.
|
||||
return
|
||||
+ if msg == "Interrupted system call":
|
||||
+ # See http://www.cherrypy.org/ticket/861.
|
||||
+ return
|
||||
raise
|
||||
|
||||
def stop(self):
|
||||
"""Gracefully shutdown a server that is serving forever."""
|
||||
self.ready = False
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue