From f83343592b7b282c25261e46870ba533686b6f4e Mon Sep 17 00:00:00 2001 From: mabashian Date: Wed, 2 Jun 2021 14:55:04 -0400 Subject: [PATCH 1/2] Only attempt to reconnect socket if connection wasn't closed cleanly --- awx/ui_next/src/util/useWebsocket.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/awx/ui_next/src/util/useWebsocket.js b/awx/ui_next/src/util/useWebsocket.js index b2e34916e6..76cec9335b 100644 --- a/awx/ui_next/src/util/useWebsocket.js +++ b/awx/ui_next/src/util/useWebsocket.js @@ -33,9 +33,11 @@ export default function useWebsocket(subscribeGroups) { ws.current.onclose = e => { // eslint-disable-next-line no-console console.debug('Socket closed. Reconnecting...', e); - setTimeout(() => { - connect(); - }, 1000); + if (e.code !== 1000) { + setTimeout(() => { + connect(); + }, 1000); + } }; ws.current.onerror = err => { From 151f9e79edf7cc87378042cd536c06ca4f431ac2 Mon Sep 17 00:00:00 2001 From: mabashian Date: Mon, 7 Jun 2021 13:30:19 -0400 Subject: [PATCH 2/2] Move debug message inside if statement so that it only triggers when we try to reconnect --- awx/ui_next/src/util/useWebsocket.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/ui_next/src/util/useWebsocket.js b/awx/ui_next/src/util/useWebsocket.js index 76cec9335b..90fdcacc14 100644 --- a/awx/ui_next/src/util/useWebsocket.js +++ b/awx/ui_next/src/util/useWebsocket.js @@ -31,9 +31,9 @@ export default function useWebsocket(subscribeGroups) { }; ws.current.onclose = e => { - // eslint-disable-next-line no-console - console.debug('Socket closed. Reconnecting...', e); if (e.code !== 1000) { + // eslint-disable-next-line no-console + console.debug('Socket closed. Reconnecting...', e); setTimeout(() => { connect(); }, 1000);