Remove lock from websocket cleanup

python/lsst/ts/rubintv/handlers/websocket.py

@@ -32,6 +32,7 @@ async def data_websocket(
     async with clients_lock:
         clients[client_id] = websocket
         websocket_to_client[websocket] = client_id
+        logger.info("Num clients:", num_clients=len(clients))
 
     try:
         while True:
@@ -89,6 +90,7 @@ async def data_websocket(
                 logger.info("Unattaching:", client_id=client_id)
                 del clients[client_id]
                 del websocket_to_client[websocket]
+                logger.info("Num clients:", num_clients=len(clients))
                 await remove_client_from_services(client_id)
 
 

python/lsst/ts/rubintv/handlers/websocket_notifiers.py

@@ -74,9 +74,8 @@ async def _send_json(websocket: WebSocket, a_dict: dict) -> None:
         await websocket.send_json(a_dict)
     except (ConnectionClosed, WebSocketDisconnect):
         logger.info("Websocket disconnected uncleanly:", websocket=websocket)
-        async with services_lock:
-            if websocket in websocket_to_client:
-                client_id = websocket_to_client[websocket]
-                del clients[client_id]
-                del websocket_to_client[websocket]
-                await remove_client_from_services(client_id)
+        if websocket in websocket_to_client:
+            client_id = websocket_to_client[websocket]
+            del clients[client_id]
+            del websocket_to_client[websocket]
+            await remove_client_from_services(client_id)

python/lsst/ts/rubintv/run_rubintv.py

@@ -1,22 +1,13 @@
 import uvicorn
 from lsst.ts.rubintv.main import app
-from uvicorn.config import LOGGING_CONFIG
 
 
 def run_rubintv() -> None:
-    LOGGING_CONFIG["formatters"]["default"][
-        "fmt"
-    ] = "%(asctime)s [%(name)s] %(levelprefix)s %(message)s"
-
-    # ping timeout/interval added to prevent unhandled disconnects.
-    # there will be a better/more understandable way of dealing with them.
     uvicorn.run(
         app,
         host="0.0.0.0",
         port=8080,
-        log_level="info",
-        ws_ping_interval=60,
-        ws_ping_timeout=120,
+        log_level="debug",
     )
 
 

src/js/components/TableApp.js

@@ -123,6 +123,9 @@ function getAllColumnNamesFromMetadata (metadata) {
 
 function getTableColumnWidths () {
   const tRow = document.querySelector('tr')
+  if (!tRow) {
+    return []
+  }
   const cellsArr = Array.from(tRow.querySelectorAll('td'))
   const cellWidths = cellsArr.map((cell) => { return cell.offsetWidth })
   return cellWidths
@@ -131,6 +134,9 @@ function getTableColumnWidths () {
 function redrawHeaderWidths () {
   const columns = getTableColumnWidths()
   const headers = Array.from(document.querySelectorAll('.grid-title'))
+  if (columns.length !== headers.length) {
+    return
+  }
   let sum = 0
   headers.forEach((title, ix) => {
     const width = columns[ix]+2

src/js/pages/camera-table.js

@@ -19,6 +19,7 @@ import { WebsocketClient } from '../modules/ws-service-client'
   const perDay = window.APP_DATA.perDay || {}
   const nightReportLink = window.APP_DATA.nightReportLink || ''
   const date = window.APP_DATA.date || ''
+
   if (!window.APP_DATA.isHistorical) {
     const ws = new WebsocketClient()
     ws.subscribe('service', 'camera', locationName, camera.name)