Changeset Navigation

Changeset 227

Timestamp:

06/01/05 15:44:39

Author:

fumanchu

Message:

Fixed error handling in wsgi; wasn't returning body.

Files:

r219	r227
48	48	level = "ERROR"
49	49	else:
50		lebel = "UNKNOWN"
	50	level = "UNKNOWN"
51	51	try:
52	52	logToScreen = cpg.config.get('server.logToScreen')

r219	r227
261	261	body = "Unrecoverable error in the server."
262	262	if extrabody is not None:
263		body += ~~extra_~~body
	263	body += "\n" + extrabody
264	264	return ("500 Internal Server Error",
265	265	[('Content-Type', 'text/plain'),

r149	r227
152	152
153	153	# We need to create the thread dict in anticipation of
154		# __init__ being called, to make s~~ire we don't ca~~l it
	154	# __init__ being called, to make sure we don't call it
155	155	# again ourselves.
156	156	dict = object.__getattribute__(self, '__dict__')

r216	r227
93	93	# not take any time at all if chunk is already of type "str".
94	94	# If it's unicode, it could be a big performance hit (x ~500).
95		chunk = str(chunk)
96		yield chunk
	95	yield str(chunk)
97	96	except:
98	97	tb = _cphttptools.formatExc()
99	98	_cputil.getSpecialFunction('_cpLogMessage')(tb)
100		s, h, b = _cphttptools.bareError()
101		start_response(s, headers, sys.exc_info())
	99	s, h, b = _cphttptools.bareError(tb)
	100	start_response(s, h, sys.exc_info())
	101	for chunk in b:
	102	yield str(chunk)
102	103
103	104