From 6552c90e4da8d1420be015c4806f88d22102ccac Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 29 Apr 2025 09:52:19 -0400 Subject: [PATCH] Clean up busy loop and other oddity with vcenter console Fix it so that common conditions do not trigger trace logs and busy loops. --- .../confluent/plugins/hardwaremanagement/vcenter.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/confluent_server/confluent/plugins/hardwaremanagement/vcenter.py b/confluent_server/confluent/plugins/hardwaremanagement/vcenter.py index 05196f20..724c9b5d 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/vcenter.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/vcenter.py @@ -38,8 +38,11 @@ class VmConsole(conapi.Console): self.socket = None def connect(self, callback): + try: + self.socket = socket.create_connection((self.host, self.port)) + except Exception: + callback(conapi.ConsoleEvent.Disconnect) self.connected = True - self.socket = socket.create_connection((self.host, self.port)) self.datacallback = callback self.recvr = eventlet.spawn(self.recvdata) @@ -56,8 +59,8 @@ class VmConsole(conapi.Console): try: pendingdata = self.socket.recv(1024) except Exception as e: - pendingdata = '' - if pendingdata == '': + pendingdata = b'' + if pendingdata == b'': self.connected = False self.datacallback(conapi.ConsoleEvent.Disconnect) return