Refactor: perform calculation of whether a connection is healthy in one

place.

Author: anthony-tuininga

src/oracledb/impl/thin/connection.pyx

@@ -269,8 +269,7 @@ cdef class BaseThinConnImpl(BaseConnImpl):
         return self._internal_name
 
     def get_is_healthy(self):
-        return self._protocol._transport is not None \
-                and self._protocol._read_buf._pending_error_num == 0
+        return self._protocol._get_is_healthy()
 
     def get_ltxid(self):
         return self._ltxid or b''

src/oracledb/impl/thin/protocol.pyx

@@ -88,6 +88,17 @@ cdef class BaseProtocol:
             self._write_buf._transport = None
             transport.disconnect()
 
+    cdef bint _get_is_healthy(self):
+        """
+        Returns a boolean indicating if the connection is considered healthy.
+        """
+        # if a read failed on the socket earlier, clear the socket
+        if self._read_buf._transport is None \
+                or self._read_buf._transport._transport is None:
+            self._transport = None
+        return self._transport is not None \
+                and self._read_buf._pending_error_num == 0
+
     cdef int _post_connect(self, BaseThinConnImpl conn_impl,
                            AuthMessage auth_message) except -1:
         """"
@@ -155,15 +166,9 @@ cdef class Protocol(BaseProtocol):
 
         with self._request_lock:
 
-            # if a read failed on the socket earlier, clear the socket
-            if self._read_buf._transport is None \
-                    or self._read_buf._transport._transport is None:
-                self._transport = None
-
             # if the session was marked as needing to be closed, force it
             # closed immediately (unless it was already closed)
-            if self._read_buf._pending_error_num != 0 \
-                    and self._transport is not None:
+            if not self._get_is_healthy() and self._transport is not None:
                 self._force_close()
 
             # rollback any open transaction and release the DRCP session, if
@@ -529,14 +534,9 @@ cdef class BaseAsyncProtocol(BaseProtocol):
 
         async with self._request_lock:
 
-            # if a read failed on the socket earlier, clear the socket
-            if self._read_buf._transport is None:
-                self._transport = None
-
             # if the session was marked as needing to be closed, force it
             # closed immediately (unless it was already closed)
-            if self._read_buf._pending_error_num != 0 \
-                    and self._transport is not None:
+            if not self._get_is_healthy() and self._transport is not None:
                 self._force_close()
 
             # rollback any open transaction and release the DRCP session, if