Fix the bug that a normal websocket closing leaves an exception log (#…

…280) This resolved #279.
snu-quiqcl · Apr 5, 2024 · a125d8d · a125d8d
2 parents 68635bf + ab84c7b
commit a125d8d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/iquip/apps/dataviewer.py b/iquip/apps/dataviewer.py
@@ -23,8 +23,8 @@
 from PyQt5.QtCore import (
     pyqtSignal, pyqtSlot, QDate, QMutex, QObject, Qt, QThread, QWaitCondition
 )
+from websockets.exceptions import ConnectionClosedOK
 from websockets.sync.client import connect, ClientConnection
-from websockets.exceptions import ConnectionClosedOK, WebSocketException
 
 import qiwis
 
@@ -899,7 +899,7 @@ def stop(self):
             return
         try:
             self.websocket.close()
-        except WebSocketException:
+        except Exception:  # pylint: disable=broad-exception-caught
             logger.exception("Failed to stop fetching the dataset name list in ARTIQ master.")
 
     def run(self):
@@ -913,6 +913,8 @@ def run(self):
                     if self.websocket.ping().wait(5):
                         continue
                     break  # connection is lost
+                except ConnectionClosedOK:
+                    return
                 self.fetched.emit(filter_dataset_list(json.loads(response)))
         except Exception:  # pylint: disable=broad-exception-caught
             logger.exception("Failed to fetch the dataset name list.")
@@ -987,7 +989,7 @@ def stop(self):
         """Stops the thread."""
         try:
             self.websocket.close()
-        except WebSocketException:
+        except Exception:  # pylint: disable=broad-exception-caught
             logger.exception("Failed to stop synchronizing.")
 
     def run(self):
@@ -1006,7 +1008,7 @@ def run(self):
                     self._initialize()
         except ConnectionClosedOK:
             self.stopped.emit("Stopped synchronizing.")
-        except WebSocketException:
+        except Exception:  # pylint: disable=broad-exception-caught
             msg = "Failed to synchronize the dataset."
             self.stopped.emit(msg)
             logger.exception(msg)

diff --git a/iquip/apps/monitor.py b/iquip/apps/monitor.py
@@ -13,6 +13,7 @@
     QCheckBox, QDoubleSpinBox, QGridLayout, QGroupBox, QHBoxLayout,
     QLabel, QPushButton, QSlider, QVBoxLayout, QWidget
 )
+from websockets.exceptions import ConnectionClosedOK
 from websockets.sync.client import connect
 
 import qiwis
@@ -230,6 +231,8 @@ def run(self):
                         if websocket.ping().wait(5):
                             continue
                         break  # connection is lost
+                    except ConnectionClosedOK:
+                        return
                     status = json.loads(response)
                     self.fetched.emit(status)
         except Exception:  # pylint: disable=broad-exception-caught

diff --git a/iquip/apps/scheduler.py b/iquip/apps/scheduler.py
@@ -13,6 +13,7 @@
 )
 from PyQt5.QtGui import QGuiApplication
 from PyQt5.QtWidgets import QAction, QPushButton, QTableView, QVBoxLayout, QWidget
+from websockets.exceptions import ConnectionClosedOK
 from websockets.sync.client import connect
 
 import qiwis
@@ -65,6 +66,8 @@ def run(self):
                         if websocket.ping().wait(5):
                             continue
                         break  # connection is lost
+                    except ConnectionClosedOK:
+                        return
                     schedule = []
                     for rid, info in json.loads(response).items():
                         expid = info["expid"]