master/worker: print short exception info in first log entry of worke…

…r error
m-labs · Nov 22, 2015 · de30a4b · de30a4b
1 parent 8b4b269
commit de30a4b
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/artiq/master/worker_impl.py b/artiq/master/worker_impl.py
@@ -221,8 +221,13 @@ def main():
                 put_object({"action": "completed"})
             elif action == "terminate":
                 break
-    except:
-        logging.error("Worker terminating with exception", exc_info=True)
+    except Exception as exc:
+        short_exc_info = type(exc).__name__
+        exc_str = str(exc)
+        if exc_str:
+            short_exc_info += ": " + exc_str
+        logging.error("Terminating with exception (%s)",
+                      short_exc_info, exc_info=True)
     finally:
         device_mgr.close_devices()