From 393734bf8d7858f30c451922e37c795e2ab1b97c Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan@onecht.net>
Date: Fri, 23 Feb 2024 09:44:26 +0100
Subject: [PATCH 1/2] Make wait in the noVNC console proxy client more generic

---
 .../cloud/consoleproxy/ConsoleProxyNoVncClient.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java
index 27fabb53124b..e113e0bbb674 100644
--- a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java
+++ b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java
@@ -114,11 +114,6 @@ public void run() {
                                 updateFrontEndActivityTime();
                             }
                             connectionAlive = session.isOpen();
-                            try {
-                                Thread.sleep(1);
-                            } catch (InterruptedException e) {
-                                s_logger.error("Error on sleep for vnc over websocket", e);
-                            }
                         } else if (client.isVncOverNioSocket()) {
                             byte[] bytesArr;
                             int nextBytes = client.getNextBytes();
@@ -139,6 +134,11 @@ public void run() {
                                 connectionAlive = false;
                             }
                         }
+                        try {
+                            Thread.sleep(1);
+                        } catch (InterruptedException e) {
+                            s_logger.error("Error on sleep for vnc over websocket", e);
+                        }
                     }
                     s_logger.info(String.format("Connection with client [%s] is dead.", clientId));
                 } catch (IOException e) {

From ce94b057b266d88e5be169ebee7963fe777e839b Mon Sep 17 00:00:00 2001
From: dahn <daan.hoogland@gmail.com>
Date: Fri, 23 Feb 2024 10:08:26 +0100
Subject: [PATCH 2/2] Update
 services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java

Co-authored-by: Wei Zhou <weizhou@apache.org>
---
 .../java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java
index e113e0bbb674..cfa62114c3d7 100644
--- a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java
+++ b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java
@@ -137,7 +137,7 @@ public void run() {
                         try {
                             Thread.sleep(1);
                         } catch (InterruptedException e) {
-                            s_logger.error("Error on sleep for vnc over websocket", e);
+                            s_logger.error("Error on sleep for vnc sessions", e);
                         }
                     }
                     s_logger.info(String.format("Connection with client [%s] is dead.", clientId));