m-labs · Mar 25, 2016 · Mar 25, 2016 · Mar 25, 2016 · Mar 25, 2016 · Mar 25, 2016
Showing with 13 additions and 14 deletions.

+6 −11 artiq/gui/log.py

+1 −1 artiq/master/worker_impl.py

+6 −2 artiq/protocols/pc_rpc.py
diff --git a/artiq/gui/log.py b/artiq/gui/log.py
@@ -63,37 +63,32 @@ def __delitem__(self, k):
     def append(self, v):
         severity, source, timestamp, message = v
         self.pending_entries.append((severity, source, timestamp,
-                                     message.split("\n")))
-
-    def insertRows(self, position, rows=1, index=QtCore.QModelIndex()):
-        self.beginInsertRows(QtCore.QModelIndex(), position, position+rows-1)
-        self.endInsertRows()
-
-    def removeRows(self, position, rows=1, index=QtCore.QModelIndex()):
-        self.beginRemoveRows(QtCore.QModelIndex(), position, position+rows-1)
-        self.endRemoveRows()
+                                     message.splitlines()))
 
     def timer_tick(self):
         if not self.pending_entries:
             return
         nrows = len(self.entries)
         records = self.pending_entries
         self.pending_entries = []
+
+        self.beginInsertRows(QtCore.QModelIndex(), nrows, nrows+len(records)-1)
         self.entries.extend(records)
         for rec in records:
             item = ModelItem(self, len(self.children_by_row))
             self.children_by_row.append(item)
             for i in range(len(rec[3])-1):
                 item.children_by_row.append(ModelItem(item, i))
-        self.insertRows(nrows, len(records))
+        self.endInsertRows()
 
         if len(self.entries) > self.depth:
             start = len(self.entries) - self.depth
+            self.beginRemoveRows(QtCore.QModelIndex(), 0, start-1)
             self.entries = self.entries[start:]
             self.children_by_row = self.children_by_row[start:]
             for child in self.children_by_row:
                 child.row -= start
-            self.removeRows(0, start)
+            self.endRemoveRows()
 
     def index(self, row, column, parent):
         if parent.isValid():

diff --git a/artiq/master/worker_impl.py b/artiq/master/worker_impl.py
@@ -255,7 +255,7 @@ def main():
             short_exc_info = type(exc).__name__
             exc_str = str(exc)
             if exc_str:
-                short_exc_info += ": " + exc_str
+                short_exc_info += ": " + exc_str.splitlines()[0]
             lines = ["Terminating with exception ("+short_exc_info+")\n"]
             if hasattr(exc, "artiq_core_exception"):
                 lines.append(str(exc.artiq_core_exception))

diff --git a/artiq/protocols/pc_rpc.py b/artiq/protocols/pc_rpc.py
@@ -510,9 +510,13 @@ async def _process_action(self, target, obj):
                                  .format(obj["action"]))
         except asyncio.CancelledError:
             raise
-        except:
+        except Exception as exc:
+            short_exc_info = type(exc).__name__
+            exc_str = str(exc)
+            if exc_str:
+                short_exc_info += ": " + exc_str.splitlines()[0]
             return {"status": "failed",
-                    "message": traceback.format_exc()}
+                    "message": short_exc_info + "\n" + traceback.format_exc()}
         finally:
             if self._noparallel is not None:
                 self._noparallel.release()