Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-27 21:29:24 +01:00
Code Issues Projects Releases Wiki Activity

Fix error handling for subprocesses.

Browse Source
This commit is contained in:
Daniel Folkinshteyn 2010-08-08 00:39:51 -04:00
parent 89fd19ed7d
commit e4498664bb
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/commands.py
View File

@ -81,8 +81,11 @@ def process(f, *args, **kwargs):
q = multiprocessing.Queue()
def newf(f, q, *args, **kwargs):
r = f(*args, **kwargs)
q.put(r)
try:
r = f(*args, **kwargs)
q.put(r)
except Exception as e:
q.put(e)
targetArgs = (f, q,) + args
p = callbacks.CommandProcess(target=newf,
args=targetArgs, kwargs=kwargs)
@ -95,6 +98,8 @@ def process(f, *args, **kwargs):
v = q.get(block=False)
except Queue.Empty:
v = "Nothing returned."
if isinstance(v, Exception):
v = "Error: " + str(v)
return v
class UrlSnarfThread(world.SupyThread):