remove unneeded code

This commit is contained in:
J. Nick Koston 2023-12-12 10:37:19 -10:00
parent 3023767440
commit 36a350ee7f
No known key found for this signature in database
3 changed files with 5 additions and 12 deletions

View File

@ -284,11 +284,8 @@ class APIClient:
def _set_log_name(self) -> None:
"""Set the log name of the device."""
ip_address: str | None = None
if self._connection:
if self._connection.connected_address:
ip_address = self._connection.connected_address
elif self._connection.resolved_addr_info:
ip_address = self._connection.resolved_addr_info[0].sockaddr.address
if self._connection and self._connection.connected_address:
ip_address = self._connection.connected_address
self.log_name = build_log_name(
self.cached_name,
self.address,
@ -336,8 +333,8 @@ class APIClient:
self.log_name,
)
await self._execute_connection_coro(self._connection.start_connection())
# If we resolved the address, we should set the log name now
if self._connection.resolved_addr_info:
# If we connected, we should set the log name now
if self._connection.connected_address:
self._set_log_name()
async def finish_connection(

View File

@ -108,7 +108,6 @@ cdef class APIConnection:
cdef bint _handshake_complete
cdef bint _debug_enabled
cdef public str received_name
cdef public object resolved_addr_info
cdef public str connected_address
cpdef void send_message(self, object msg)

View File

@ -207,7 +207,6 @@ class APIConnection:
"_handshake_complete",
"_debug_enabled",
"received_name",
"resolved_addr_info",
"connected_address",
)
@ -252,7 +251,6 @@ class APIConnection:
self._handshake_complete = False
self._debug_enabled = debug_enabled
self.received_name: str = ""
self.resolved_addr_info: list[hr.AddrInfo] = []
self.connected_address: str | None = None
def set_log_name(self, name: str) -> None:
@ -572,8 +570,7 @@ class APIConnection:
async def _do_connect(self) -> None:
"""Do the actual connect process."""
self.resolved_addr_info = await self._connect_resolve_host()
await self._connect_socket_connect(self.resolved_addr_info)
await self._connect_socket_connect(await self._connect_resolve_host())
async def start_connection(self) -> None:
"""Start the connection process.