Set tpool to be quiet by default, improved exception raising.

This commit is contained in:
Ryan Williams
2010-01-05 18:58:53 -08:00
parent 5464cd0fb6
commit 155f9c0e45

View File

@@ -15,12 +15,13 @@
import os import os
import threading import threading
import sys
from Queue import Empty, Queue from Queue import Empty, Queue
from eventlet import api, coros, greenio from eventlet import api, coros, greenio
QUIET=False QUIET=True
_rfile = _wfile = None _rfile = _wfile = None
@@ -69,9 +70,7 @@ def tworker():
except SYS_EXCS: except SYS_EXCS:
raise raise
except Exception,exn: except Exception,exn:
import sys rv = sys.exc_info()
(a,b,tb) = sys.exc_info()
rv = (exn,a,b,tb)
_rspq.put((e,rv)) _rspq.put((e,rv))
meth = args = kwargs = e = rv = None meth = args = kwargs = e = rv = None
_signal_t2e() _signal_t2e()
@@ -79,13 +78,13 @@ def tworker():
def erecv(e): def erecv(e):
rv = e.wait() rv = e.wait()
if isinstance(rv,tuple) and len(rv) == 4 and isinstance(rv[0],Exception): if isinstance(rv,tuple) and len(rv) == 3 and isinstance(rv[1],Exception):
import traceback import traceback
(e,a,b,tb) = rv (c,e,tb) = rv
if not QUIET: if not QUIET:
traceback.print_exception(Exception,e,tb) traceback.print_exception(c,e,tb)
traceback.print_stack() traceback.print_stack()
raise e raise c,e,tb
return rv return rv