From 946fc56b70b120bb836c29fd55b5e346c6ed67a7 Mon Sep 17 00:00:00 2001 From: Michel Weststrate Date: Wed, 8 Sep 2021 09:55:25 -0700 Subject: [PATCH] Don't eat exceptions Summary: if a resolved client doesn't become available, we were eating the exception. This diff changes that, as exceptions might actually occur (e.g. a timeout, indicating that for example the device didn't become available, which points out a bug in the example below). We might now over report some issues, causing regressions in our monitoring, but let's work from there. Reviewed By: timur-valiev Differential Revision: D30806511 fbshipit-source-id: 09d62bd7c41439aa452b6df501426e239559eba2 --- desktop/app/src/server/comms/ServerRSocket.tsx | 8 +++++++- desktop/app/src/server/comms/ServerWebSocketBrowser.tsx | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/desktop/app/src/server/comms/ServerRSocket.tsx b/desktop/app/src/server/comms/ServerRSocket.tsx index d8e61a7ec..959109464 100644 --- a/desktop/app/src/server/comms/ServerRSocket.tsx +++ b/desktop/app/src/server/comms/ServerRSocket.tsx @@ -166,7 +166,13 @@ class ServerRSocket extends ServerAdapter { clientQuery, clientConnection, ); - client.then((client) => (resolvedClient = client)).catch((_) => {}); + client + .then((client) => { + resolvedClient = client; + }) + .catch((e) => { + console.error('Failed to resolve new client', e); + }); return { fireAndForget: (payload: {data: string}) => { diff --git a/desktop/app/src/server/comms/ServerWebSocketBrowser.tsx b/desktop/app/src/server/comms/ServerWebSocketBrowser.tsx index c32d0bf3e..55b005ebd 100644 --- a/desktop/app/src/server/comms/ServerWebSocketBrowser.tsx +++ b/desktop/app/src/server/comms/ServerWebSocketBrowser.tsx @@ -109,7 +109,13 @@ class ServerWebSocketBrowser extends ServerWebSocketBase { extendedClientQuery, clientConnection, ); - client.then((client) => (resolvedClient = client)).catch((_) => {}); + client + .then((client) => { + resolvedClient = client; + }) + .catch((e) => { + console.error('Failed to connect client over webSocket', e); + }); clients[app] = client;