some commit

This commit is contained in:
Benoit Chesneau 2009-12-02 20:52:15 +01:00
parent 93097b74e6
commit a4685eff77

View File

@ -149,13 +149,11 @@ class HTTPServer(object):
def process_client(self, listener, conn, addr): def process_client(self, listener, conn, addr):
""" do nothing just echo message""" """ do nothing just echo message"""
fcntl.fcntl(conn.fileno(), fcntl.F_SETFD, fcntl.FD_CLOEXEC)
req = HTTPRequest(conn, addr, listener.getsockname()) req = HTTPRequest(conn, addr, listener.getsockname())
try: result = self.app(req.read(), req.start_response)
result = self.app(req.read(), req.start_response) response = HTTPResponse(req, result)
response = HTTPResponse(req, result) response.send()
response.send()
except Exception, e:
print >>sys.stderr, str(e)
req.close() req.close()
def worker_loop(self, worker_pid, worker): def worker_loop(self, worker_pid, worker):
@ -173,11 +171,13 @@ class HTTPServer(object):
sock = self.LISTENERS[fileno] sock = self.LISTENERS[fileno]
try: try:
self.process_client(sock, *sock.accept()) self.process_client(sock, *sock.accept())
m = 0 if m == 1 else 1
os.fchmod(alive, m)
except errno.EAGAIN, errno.ECONNABORTED: except errno.EAGAIN, errno.ECONNABORTED:
pass pass
except Exception, e:
m = 0 if m == 1 else 1 print >>sys.stderr, str(e)
os.fchmod(alive, m)
if ppid != os.getppid(): return if ppid != os.getppid(): return
m = 0 if m == 1 else 1 m = 0 if m == 1 else 1