console proxy client sleep more generic (#8694)

DaanHoogland · weizhouapache · web-flow · commit 4e34e6b33488 · 2024-02-27T11:54:05.000+05:30
* Make wait in the noVNC console proxy client more generic

* Update services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java

Co-authored-by: Wei Zhou &lt;weizhou@apache.org&gt;

---------

Co-authored-by: Wei Zhou &lt;weizhou@apache.org&gt;
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
@@ -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 sessions", e);
+                        }
                     }
                     s_logger.info(String.format("Connection with client [%s] is dead.", clientId));
                 } catch (IOException e) {

Original file line number	Diff line number	Diff line change
`@@ -114,11 +114,6 @@ public void run() {`
`114`	`114`	`updateFrontEndActivityTime();`
`115`	`115`	`}`
`116`	`116`	`connectionAlive = session.isOpen();`
`117`		`- try {`
`118`		`- Thread.sleep(1);`
`119`		`- } catch (InterruptedException e) {`
`120`		`- s_logger.error("Error on sleep for vnc over websocket", e);`
`121`		`- }`
`122`	`117`	`} else if (client.isVncOverNioSocket()) {`
`123`	`118`	`byte[] bytesArr;`
`124`	`119`	`int nextBytes = client.getNextBytes();`
`@@ -139,6 +134,11 @@ public void run() {`
`139`	`134`	`connectionAlive = false;`
`140`	`135`	`}`
`141`	`136`	`}`
	`137`	`+ try {`
	`138`	`+ Thread.sleep(1);`
	`139`	`+ } catch (InterruptedException e) {`
	`140`	`+ s_logger.error("Error on sleep for vnc sessions", e);`
	`141`	`+ }`
`142`	`142`	`}`
`143`	`143`	`s_logger.info(String.format("Connection with client [%s] is dead.", clientId));`
`144`	`144`	`} catch (IOException e) {`