Changeset Navigation

Changeset 1273

Timestamp:

08/23/06 18:40:51

Author:

fumanchu

Message:

WSGI server: uncaught exceptions now write tracebacks to the response stream if possible.

Files:

r1272	r1273
358	358	def communicate(self):
359	359	"""Read each request and respond appropriately."""
360		while True:
361		req = self.RequestHandlerClass(self)
362		# This order of operations should guarantee correct pipelining.
363		req.parse_request()
364		if not req.ready:
365		break
366		req.respond()
367		if req.close_connection:
368		break
	360	try:
	361	while True:
	362	# (re)set req to None so that if something goes wrong in
	363	# the RequestHandlerClass constructor, the error doesn't
	364	# get written to the previous request.
	365	req = None
	366	req = self.RequestHandlerClass(self)
	367	# This order of operations should guarantee correct pipelining.
	368	req.parse_request()
	369	if not req.ready:
	370	break
	371	req.respond()
	372	if req.close_connection:
	373	break
	374	except socket.error, e:
	375	errno = e.args[0]
	376	if errno not in socket_errors_to_ignore:
	377	if req:
	378	req.simple_response("500 Internal Server Error",
	379	traceback.format_exc())
	380	except (KeyboardInterrupt, SystemExit):
	381	raise
	382	except:
	383	if req:
	384	req.simple_response("500 Internal Server Error",
	385	traceback.format_exc())
369	386
370	387	def close(self):
…	…
392	409
393	410	try:
394		try:
395		conn.communicate()
396		except socket.error, e:
397		errno = e.args[0]
398		if errno not in socket_errors_to_ignore:
399		traceback.print_exc()
400		except (KeyboardInterrupt, SystemExit), exc:
401		self.server.interrupt = exc
402		except:
403		traceback.print_exc()
	411	conn.communicate()
404	412	finally:
405	413	conn.close()