From 251aed047f08b8225c9a7953a37df3a34fcd6674 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 25 Feb 2016 01:10:31 +0800 Subject: [PATCH] worker: do not print redundant exception information --- artiq/master/worker_impl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/artiq/master/worker_impl.py b/artiq/master/worker_impl.py index 164bf7cc4..769bcb17c 100644 --- a/artiq/master/worker_impl.py +++ b/artiq/master/worker_impl.py @@ -257,9 +257,9 @@ def main(): if exc_str: short_exc_info += ": " + exc_str lines = ["Terminating with exception ("+short_exc_info+")\n"] - lines += traceback.format_exception_only(type(exc), exc) if hasattr(exc, "parent_traceback"): lines += exc.parent_traceback + lines += traceback.format_exception_only(type(exc), exc) logging.error("".join(lines).rstrip(), exc_info=not hasattr(exc, "parent_traceback")) put_object({"action": "exception"})