M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

worker: restore short exception info in first line of log

This commit is contained in:
Sebastien Bourdeauducq 2016-01-26 22:07:54 +01:00
parent 3cf67afeb1
commit be5162d60f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artiq/master/worker_impl.py
View File

@ -252,7 +252,11 @@ def main():
# When we get CompileError, a more suitable diagnostic has already # When we get CompileError, a more suitable diagnostic has already
# been printed. # been printed.
if not isinstance(exc, CompileError): if not isinstance(exc, CompileError):
lines = ["Terminating with exception\n"] short_exc_info = type(exc).__name__
exc_str = str(exc)
if exc_str:
short_exc_info += ": " + exc_str
lines = ["Terminating with exception ("+short_exc_info+")\n"]
lines += traceback.format_exception_only(type(exc), exc) lines += traceback.format_exception_only(type(exc), exc)
if hasattr(exc, "parent_traceback"): if hasattr(exc, "parent_traceback"):
lines += exc.parent_traceback lines += exc.parent_traceback